|
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 |
|
|
FFXN
|
9a77590216
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
|
2026-04-17 16:03:12 +08: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 |
|
|
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 |
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
wdeveloper16andGitHub
|
149b9d4c0f
|
refactor: replace bare dict with dict[str, Any] in services unit test helpers (#35182)
|
2026-04-14 18:37:59 +00:00 |
|
|
JamesandGitHub
|
f63d7c4121
|
test: remove document service status mock tests superseded by testcontainers (#35197)
|
2026-04-14 18:07:00 +00:00 |
|
|
wdeveloper16andGitHub
|
50a6892c3a
|
refactor: replace bare dict with dict[str, Any] in controller and core unit tests (#35181)
|
2026-04-14 17:51:49 +00:00 |
|
|
|
62f42b3f24
|
refactor: replace bare dict with dict[str, Any] in RAG and service unit tests (#35184)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-14 17:50:43 +00:00 |
|
|
|
e2e5ad0c33
|
Merge remote-tracking branch 'origin/deploy/dev' into feat/evaluation
# Conflicts:
# api/tests/unit_tests/services/test_async_workflow_service.py
# api/tests/unit_tests/services/test_webhook_service.py
Co-authored-by: FFXN <[email protected]>
|
2026-04-14 07:28:30 +00:00 |
|
|
99andGitHub
|
28185170b0
|
test: split merged API test modules and remove F811 ignore (#35105)
|
2026-04-14 03:54:30 +00:00 |
|
|
CodingOnStar
|
35bbf702ed
|
Merge branch 'feat/create-app' into deploy/dev
|
2026-04-13 14:39:50 +08:00 |
|
|
|
11c518478e
|
test: migrate AudioService TTS message-ID lookup tests to Testcontainers integration tests (#34992)
Co-authored-by: Copilot Autofix powered by AI <[email protected]>
|
2026-04-13 06:26:43 +00:00 |
|
|
|
e823635ce1
|
test: migrate app_dsl_service tests to testcontainers (#34429)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-13 06:25:28 +00:00 |
|
|
|
29bfa33d59
|
feat: support ttft report to langfuse (#33344)
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>
|
2026-04-13 06:21:58 +00:00 |
|
|
|
17da0e4146
|
test: migrate BillingService permission-check tests to Testcontainers integration tests (#34993)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-13 03:44:14 +00:00 |
|
|
-LAN-andGitHub
|
8c4ea5c898
|
fix: external dataset tenant checks for bound knowledge APIs (#34734)
|
2026-04-13 01:47:57 +00:00 |
|
|
|
88c38ddeb3
|
test: migrate conversation rename/delete edge cases to Testcontainers integration tests (#34991)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-13 00:55:58 +00:00 |
|
|
|
0841b4c663
|
refactor(api): migrate tools, account, workflow and plugin services to SQLAlchemy 2.0 (#34966)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-12 01:45:27 +00:00 |
|
|
|
440602f52a
|
refactor(services): migrate summary_index_service to SQLAlchemy 2.0 select() API (#34971)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-12 01:37:16 +00:00 |
|
|
|
510120410b
|
refactor(services): migrate trigger_provider_service to SQLAlchemy 2.0 select() API (#34972)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-12 01:36:13 +00:00 |
|
|
|
4ef67fef3a
|
refactor(services): migrate builtin_tools_manage_service to SQLAlchemy 2.0 select() API (#34973)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-12 01:25:51 +00:00 |
|
|
wdeveloper16andGitHub
|
7bd5e80323
|
refactor(services): migrate datasource_provider_service to SQLAlchemy 2.0 select() API (#34974)
|
2026-04-12 01:23:24 +00:00 |
|
|
|
7515eee0a8
|
refactor(services): migrate dataset_service and clear_free_plan_tenant_expired_logs to SQLAlchemy 2.0 select() API (#34970)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-12 01:21:52 +00:00 |
|
|
|
34ce3cac70
|
test: migrate RagPipelineService DB operation SQL tests to Testcontainer (#34959)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-11 16:32:52 +00:00 |
|
|
BitTobyandGitHub
|
d5104a4268
|
test: remove dataset permission mock tests superseded by testcontainers (#34936)
|
2026-04-11 04:29:39 +00:00 |
|
|
BitTobyandGitHub
|
0ff41a1127
|
test: remove dataset metadata mock tests superseded by testcontainers (#34931)
|
2026-04-11 03:37:20 +00:00 |
|
|
BitTobyandGitHub
|
7192af41e4
|
test: remove dataset service update/delete mock tests superseded by testcontainers (#34937)
|
2026-04-11 00:54:58 +00:00 |
|
|
|
2dc015b360
|
fix(api): default parent_mode to paragraph for hierarchical chunking via API (#34635)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-10 10:55:40 +00:00 |
|
|
|
e224c77920
|
test: migrate hit_testing_service tests to testcontainers (#34750)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-10 08:26:40 +00:00 |
|
|
|
28b8215c9b
|
test: migrate ops_service tests to testcontainers (#34749)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-10 08:25:50 +00:00 |
|
|
呆萌闷油瓶andGitHub
|
cd3ee5bd5d
|
fix: sqlalchemy.orm.exc.DetachedInstanceError (#34910)
|
2026-04-10 07:44:22 +00:00 |
|
|
|
bcd738d2e6
|
fix: fix orm_exc.DetachedInstanceError (#34904)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-10 07:13:59 +00:00 |
|
|
-LAN-andGitHub
|
b90fe73c96
|
fix(api): prevent cross-tenant external API use-check disclosure (#34744)
|
2026-04-10 03:23:32 +00:00 |
|
|
aliworksx08andGitHub
|
e143dbce50
|
refactor: migrate session.query to select API in webhook service (#34849)
|
2026-04-09 14:16:33 +00:00 |
|