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 |
|
Joel
|
3bb3670cb5
|
merge
|
2026-04-20 13:41:51 +08: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 |
|
JzoNg
|
cdd57c4b7d
|
fix merge error
|
2026-04-17 17:34:15 +08:00 |
|
FFXN
|
0e320290e1
|
feat: evaluation (#35353)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Yansong Zhang <916125788@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <mambahj24@gmail.com>
Co-authored-by: hj24 <huangjian@dify.ai>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: 非法操作 <hjlarry@163.com>
Co-authored-by: Ayush Baluni <73417844+aayushbaluni@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: jimcody1995 <jjimcody@gmail.com>
Co-authored-by: James <63717587+jamesrayammons@users.noreply.github.com>
Co-authored-by: Yunlu Wen <yunlu.wen@dify.ai>
Co-authored-by: Stephen Zhou <hi@hyoban.cc>
Co-authored-by: Coding On Star <447357187@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jerryzai <jerryzh8710@protonmail.com>
Co-authored-by: NVIDIAN <speedy.hpc@hotmail.com>
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: Junghwan <70629228+shaun0927@users.noreply.github.com>
Co-authored-by: HeYinKazune <70251095+HeYin-OS@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: Jingyi <jingyi.qi@dify.ai>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: sxxtony <166789813+sxxtony@users.noreply.github.com>
|
2026-04-17 16:37:21 +08: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 |
|
FFXN
|
b60533dcc3
|
fix import
|
2026-04-17 16:16:26 +08:00 |
|
FFXN
|
9a77590216
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
|
2026-04-17 16:03:12 +08:00 |
|
CodingOnStar
|
90384b26b3
|
merge
|
2026-04-16 16:58:52 +08: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 |
|
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 <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-04-16 02:21:04 +00:00 |
|
FFXN
|
f9b76f0f52
|
feat: evaluation (#35251)
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Yansong Zhang <916125788@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <mambahj24@gmail.com>
Co-authored-by: hj24 <huangjian@dify.ai>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
|
2026-04-15 16:09:40 +08:00 |
|
copilot-swe-agent[bot]
|
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 <31929997+FFXN@users.noreply.github.com>
|
2026-04-14 07:28:30 +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 |
|
wdeveloper16
|
ed83f5369e
|
refactor: replace bare dict with dict[str, Any] in entities, workflow nodes, and tasks (#35109)
|
2026-04-14 03:02:39 +00:00 |
|
hj24
|
815c536e05
|
fix: optimize trigger long running read transactions (#35046)
|
2026-04-13 08:22:54 +00:00 |
|
CodingOnStar
|
35bbf702ed
|
Merge branch 'feat/create-app' into deploy/dev
|
2026-04-13 14:39:50 +08:00 |
|
wdeveloper16
|
f67297688f
|
refactor(tasks): migrate document_indexing_task and remove_app_and_related_data_task to SQLAlchemy 2.0 select() API (#34968)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
2026-04-12 01:49:56 +00:00 |
|
dataCenter430
|
c9f525a3b2
|
refactor(api): type workflow generator args dict with TypedDict (#34876)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-10 08:27:32 +00:00 |
|
Renzo
|
75b88a5416
|
refactor: migrate session.query to select API in deal dataset index update task (#34847)
|
2026-04-09 14:17:08 +00:00 |
|
Stephen Zhou
|
d6c3df33c1
|
Merge branch 'main' into deploy/dev
|
2026-04-09 16:45:53 +08:00 |
|
Renzo
|
9a51c2f56a
|
refactor: migrate session.query to select API in deal dataset vector index task (#34819)
|
2026-04-09 05:50:59 +00:00 |
|
Renzo
|
e3cc4b83c8
|
refactor: migrate session.query to select API in clean dataset task (#34815)
|
2026-04-09 05:46:36 +00:00 |
|
Renzo
|
f5ea61e93e
|
refactor: migrate session.query to select API in document indexing sync task (#34813)
|
2026-04-09 05:44:13 +00:00 |
|
Renzo
|
5821511114
|
refactor: migrate session.query to select API in batch clean and disable segments tasks (#34760)
|
2026-04-08 23:20:25 +00:00 |
|
Renzo
|
d6d9b04c41
|
refactor: migrate session.query to select API in add document and clean document tasks (#34761)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-08 23:19:36 +00:00 |
|
Renzo
|
540289e6c6
|
refactor: migrate session.query to select API in delete segment and regenerate summary tasks (#34763)
|
2026-04-08 23:19:03 +00:00 |
|
Renzo
|
289f091bf9
|
refactor: migrate session.query to select API in delete conversation task (#34772)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-08 23:15:19 +00:00 |
|
hj24
|
8ca0917044
|
Merge branch 'main' into feat/new-biliing-quota
|
2026-04-08 13:39:24 +08:00 |
|
Renzo
|
2127d5850f
|
refactor: replace untyped dicts with TypedDict in VDB config classes (#34697)
|
2026-04-08 00:57:11 +00:00 |
|
carlos4s
|
ae9fcc2969
|
refactor: use sessionmaker in controllers, events, models, and tasks 1 (#34693)
|
2026-04-07 23:47:20 +00:00 |
|
Renzo
|
cb55176612
|
refactor: migrate session.query to select API in small task files batch (#34684)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-07 22:58:23 +00:00 |
|
Renzo
|
e2ecd68556
|
refactor: migrate session.query to select API in rag pipeline task files (#34648)
|
2026-04-07 05:56:19 +00:00 |
|
Renzo
|
173e818a62
|
refactor: migrate session.query to select API in summary and remove document tasks (#34650)
|
2026-04-07 05:55:31 +00:00 |
|
Renzo
|
3e995e6a6d
|
refactor: migrate session.query to select API in document task files (#34646)
|
2026-04-07 05:53:21 +00:00 |
|
Renzo
|
1194957fde
|
refactor: migrate session.query to select API in end_user_service and small tasks (#34620)
|
2026-04-07 04:25:55 +00:00 |
|
Renzo
|
68bd29eda2
|
refactor: migrate session.query to select API in sync task and services (#34619)
|
2026-04-07 04:23:14 +00:00 |
|
Renzo
|
ac8bd12609
|
refactor: migrate session.query to select API in small task files (#34617)
|
2026-04-07 04:13:22 +00:00 |
|
FFXN
|
3df173948c
|
feat: many refactors.
|
2026-04-03 17:09:33 +08:00 |
|
99
|
8f9dbf269e
|
chore(api): align Python support with 3.12 (#34419)
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
|
2026-04-02 05:07:32 +00:00 |
|
Yansong Zhang
|
422bf3506e
|
rebuild quota service
|
2026-03-31 14:59:45 +08:00 |
|
Yansong Zhang
|
6e745f9e9b
|
fix linter
|
2026-03-31 09:49:24 +08:00 |
|
Yansong Zhang
|
4e50d55339
|
fix comment
|
2026-03-31 09:49:09 +08:00 |
|
Yansong Zhang
|
c5f30a47f0
|
Merge remote-tracking branch 'origin/main' into feat/new-biliing-quota
|
2026-03-30 15:26:38 +08:00 |
|
FFXN
|
48d4c54762
|
feat: snippet input_fields.
|
2026-03-30 15:22:27 +08: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 |
|
Yansong Zhang
|
37d438fa19
|
Merge remote-tracking branch 'origin/main' into feat/new-biliing-quota
|
2026-03-27 16:26:09 +08:00 |
|
Xiyuan Chen
|
5a8a68cab8
|
feat: enterprise otel exporter (#33138)
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: Yunlu Wen <yunlu.wen@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-27 07:56:31 +00:00 |
|
tmimmanuel
|
2ea85d3ba2
|
refactor: use EnumText for model_type and WorkflowNodeExecution.status (#34093)
Co-authored-by: Krishna Chaitanya <krishnabkc15@gmail.com>
|
2026-03-26 20:34:44 +00:00 |
|