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
yyh
ae9c4244d6
feat(dify-ui): Meter primitive and billing adoption ( #35380 )
2026-04-18 07:13:54 +00:00
JzoNg
cdd57c4b7d
fix merge error
2026-04-17 17:34:15 +08:00
yyh
dfcc0f8863
refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui ( #35349 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-17 08:46:11 +00: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
9a77590216
Merge remote-tracking branch 'origin/main' into feat/evaluation
2026-04-17 16:03:12 +08:00
JzoNg
38736c154b
Merge branch 'main' into jzh
2026-04-17 14:05:23 +08:00
yyh
b565a51ed9
refactor(web): quality closure pass on base UI primitives ( #35333 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 23:56:11 +00:00
Stephen Zhou
6ca066983d
chore: auto fix for tailwind rules ( #35332 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 17:11:06 +00:00
Stephen Zhou
abb84f1c38
chore: enable noUncheckedIndexedAccess ( #35178 )
2026-04-16 13:01:35 +00:00
JzoNg
ac2104581b
fix merge confilcts of evaluation-fe
2026-04-16 12:47:16 +08:00
JzoNg
0d47750b15
Merge branch 'main' into jzh
2026-04-16 11:48:48 +08:00
yyh
538093855b
refactor(web): align Switch API with Base UI naming convention ( #35269 )
...
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
2026-04-15 15:47:59 +00:00
yyh
af7d5e60b4
feat(ui): scaffold @langgenius/dify-ui and migrate design tokens ( #35256 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-15 13:11:20 +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
FFXN
13f0b141ac
Merge branch 'deploy/dev' into feat/evaluation
2026-04-15 16:07:50 +08:00
JzoNg
e6e063138e
Merge branch 'main' into jzh
2026-04-15 10:20:27 +08:00
yyh
e1bbe57f9c
refactor(web): re-design button api ( #35166 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 13:22:23 +00:00
JzoNg
f93b287949
feat(web): billing for evaluation & snippets
2026-04-12 11:09:15 +08:00
hj24
ef7dc9eabb
Merge branch 'feat/new-biliing-quota' into deploy/dev
2026-04-08 15:02:50 +08:00
Stephen Zhou
36e840cd87
chore: knip fix ( #34481 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-02 15:03:42 +00:00
Stephen Zhou
894826771a
chore: clean up useless tailwind reference ( #34478 )
2026-04-02 11:45:19 +00:00
Joel
cad9936c0a
Merge branch 'fix/ps-not-send' into deploy/dev
2026-04-02 17:55:04 +08:00
hj24
8c0b596ced
Merge branch 'chore-debug-partnerstack' into deploy/dev
2026-04-02 17:54:06 +08:00
Joel
65e434cf06
chore: add debug
2026-04-02 17:53:52 +08:00
Stephen Zhou
1873b22e96
refactor: update to tailwind v4 ( #34415 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2026-04-02 07:06:11 +00:00
Joel
359007848d
chore: remove save binded cookie
2026-04-02 12:53:07 +08:00
Joel
20ddc9c48a
fix: url query change record cookie
2026-04-02 11:22:46 +08:00
Stephen Zhou
52a4bea88f
refactor: introduce pnpm workspace ( #34241 )
...
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-30 10:34:50 +00:00
Joel
f87dafa229
fix: partner stack not recorded when not login ( #34062 )
2026-03-25 16:16:52 +08:00
yyh
d14635625c
feat(web): refactor pricing modal scrolling and accessibility ( #34011 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-03-24 17:18:36 +08:00
yyh
27ed40225d
refactor(web): update frontend toast call sites to use the new shortcut API ( #33808 )
...
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-20 16:02:22 +08:00
yyh
93f9546353
refactor(web): migrate core toast call sites to base ui toast ( #33643 )
2026-03-18 16:53:55 +08:00
yyh
296b7044af
refactor: route next/navigation through compat re-export ( #33636 )
2026-03-18 12:57:03 +08:00
yyh
69d1ccb7a7
refactor: route next/link through compat re-export ( #33632 )
2026-03-18 12:14:59 +08:00
yyh
bbe975c6bc
feat: enhance model plugin workflow checks and model provider management UX ( #33289 )
...
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Coding On Star <447357187@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: statxc <tyleradams93226@gmail.com>
2026-03-18 10:16:15 +08:00
Stephen Zhou
a01c384f5b
chore: remove next font ( #33512 )
2026-03-16 14:57:25 +08:00
yyh
c43307dae1
refactor(switch): Base UI migration with loading/skeleton variants ( #33345 )
...
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-12 14:40:43 +08:00
yyh
ea0e1b52a8
refactor(web): make Switch controlled-only and migrate call sites ( #32399 )
2026-02-18 23:47:07 +08:00
Apoorv Darshan
00591a592c
refactor(web): replace String.match() with RegExp.exec() for non-global regex ( #32386 )
2026-02-18 17:46:38 +09:00
Coding On Star
b6d506828b
test(web): add and enhance frontend automated tests across multiple modules ( #32268 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
2026-02-13 10:27:48 +08:00
Coding On Star
80e6312807
test: add comprehensive unit and integration tests for billing components ( #32227 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
2026-02-12 10:05:06 +08:00
QuantumGhost
a1fc280102
feat: Human Input Node ( #32060 )
...
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
2026-02-09 14:57:23 +08:00
QuantumGhost
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
Wu Tianwei
fedd097f63
feat: Human Input node (Frontend Part) ( #31631 )
...
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
2026-01-30 10:16:46 +08:00
Coding On Star
8f414af34e
test: add comprehensive tests ( #31649 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-29 11:16:26 +08:00
Coding On Star
76a0249eaf
feat: enhance ProgressBar and UsageInfo for storage mode ( #31273 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
2026-01-21 14:04:33 +08:00
yyh
3bee2ee067
refactor(contract): restructure console contracts with nested billing module ( #30999 )
2026-01-15 10:41:18 +08:00