jprdonnelly/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-10 15:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,674 Commits 493 Branches 170 Tags
215d3ed42da4e88c9245b969f16f43b10fc8a96a
Commit Graph

1126 Commits

Author SHA1 Message Date
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
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
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
9a77590216 Merge remote-tracking branch 'origin/main' into feat/evaluation 2026-04-17 16:03:12 +08:00
FFXN
cf7320be8d query snippet published history 2026-04-17 15:07:54 +08:00
Junghwan
de15e5b449 fix: scope plugin inner API end-user lookup by tenant (#35325) 2026-04-17 06:12:07 +00:00
NVIDIAN
af21dc7df8 refactor(api): migrate dataset document response schemas to BaseModel (#35298) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-17 05:02:04 +00:00
NVIDIAN
13a9359191 refactor(api): migrate console mcp-server responses to BaseModel (#35219) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 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
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
NVIDIAN
b665eaa015 refactor(api): migrate console conversation responses to BaseModel (#35294) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-16 05:11:21 +00:00
JzoNg
ac2104581b fix merge confilcts of evaluation-fe 2026-04-16 12:47:16 +08:00
FFXN
5e7d9eff84 feat: evaluation (#35290) 
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-16 11:25:23 +08:00
FFXN
68e371a365 Merge remote-tracking branch 'origin/feat/evaluation' into feat/evaluation 2026-04-16 11:19:25 +08:00
FFXN
a3ec4ee1af get snippet draft with input_fields. 2026-04-16 11:18:41 +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
NVIDIAN
dbceb3067e refactor(api): migrate console tag responses from marshal_with to BaseModel (#35208) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-15 09:57:27 +00:00
zyssyz123
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 <iamjoel007@gmail.com>
 2026-04-15 09:18:29 +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
Yansong Zhang
a2da263cbb remove enable for get 2026-04-15 15:17:46 +08:00
非法操作
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
NVIDIAN
25c388d0db refactor(api): migrate console workflow-trigger responses to BaseModel (#35200) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:52:17 +00:00
NVIDIAN
b1722c8af9 refactor(api): migrate console conversation variables response model to BaseModel (#35193) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:51:33 +00:00
NVIDIAN
b65a5fcd97 refactor(api): migrate service api workflow responses from marshal_with to BaseModel (#35195) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:50:59 +00:00
NVIDIAN
1c3cba281a refactor(api): migrate console message responses from marshal_with to BaseModel (#35204) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:49:33 +00:00
NVIDIAN
800954f8ce refactor(api): migrate service conversation-variable responses to BaseModel (#35205) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:49:21 +00:00
NVIDIAN
f66a3c49c4 refactor(api): migrate console recommended-app response to BaseModel (#35206) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
 2026-04-14 19:48:43 +00:00
NVIDIAN
ef396ac84e refactor(api): migrate workspace current response from marshal_with to BaseModel (#35207) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:48:09 +00:00
wdeveloper16
7e7b27fdec refactor: replace bare dict with dict[str, Any] in response converter… (#35212) 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-14 19:45:04 +00:00
NVIDIAN
b1df52b8ff refactor(api): migrate console workflow app-log responses to BaseModel (#35201) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 18:43:09 +00:00
NVIDIAN
e527b7c5f1 refactor(api): migrate console installed-app list response to BaseModel (#35202) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 18:40:40 +00:00
NVIDIAN
e78558bc06 refactor(api): migrate dataset hit-testing response model to BaseModel (#35192) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 18:12:40 +00:00
NVIDIAN
ef062fb397 refactor(api): migrate console extension endpoint from api.model to BaseModel (#35189) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 17:58:33 +00:00
NVIDIAN
a2ea7ca039 refactor(api): migrate workspace account marshal_with responses to BaseModel (#35190) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 17:57:34 +00: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
aether
711fe6ba2c refactor: convert plugin permission if/elif to match/case (#30001) (#35140) 2026-04-14 07:03:53 +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
2f682780fa refactor: replace bare dict with dict[str, Any] in rag_pipeline and datasource_provider services (#35107) 2026-04-14 03:02:41 +00:00
aviu16
f040733e28 refactor(api): type _jsonify_form_definition payload with FormDefinitionPayload TypedDict (#35094) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-13 19:21:19 +00:00
dataCenter430
b0bf7ca486 refactor: replace bare dict with typed annotations in controllers (#35095) 2026-04-13 19:19:52 +00:00
hj24
08f3133414 fix: db session expired issue (#35049) 2026-04-13 13:06:13 +00:00
wdeveloper16
d412cddf39 refactor: replace bare dict with UtmInfo TypedDict in operation_service (#35055) 2026-04-13 13:05:47 +00:00