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

6301 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
Yansong Zhang
20524a5503 fix mode 2026-04-20 14:36:31 +08: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
Asuka Minato
059d605a6d ci: Update pyrefly dependency version to 0.61.1 (#35391) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-19 15:49:24 +00:00
Asuka Minato
f8a4205ac4 chore: Replace 'db' with 'sa' for SQLAlchemy compatibility (#35373) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-19 09:56:19 +00: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
非法操作
f980d5d3be feat: copy nodes cross apps (#33273) 
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-17 10:02:26 +00:00
JzoNg
cdd57c4b7d fix merge error 2026-04-17 17:34:15 +08:00
jerryzai
b9c300d570 chore(api): migrate mail task and OAuth data source to use Session(db… (#35235) 
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2026-04-17 08:52:27 +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
b60533dcc3 fix import 2026-04-17 16:16:26 +08:00
YBoy
0020aa8f59 refactor(api): type pipeline template retrieval dicts with TypedDict (#34874) 2026-04-17 08:13:54 +00:00
jerryzai
e70e4fa41d chore(api): migrate file factory builders and account commands to use Session(db.engine) (#35236) 
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 08:12:31 +00:00
FFXN
9a77590216 Merge remote-tracking branch 'origin/main' into feat/evaluation 2026-04-17 16:03:12 +08:00
Yunlu Wen
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
zyssyz123
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
Cocoon-Break
0c41d0bf51 fix: guard against KeyError in update_prompt_message_tool loop (#35150) 
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
 2026-04-17 07:09:40 +00:00
FFXN
cf7320be8d query snippet published history 2026-04-17 15:07:54 +08:00
James
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
sxxtony
90d638fba3 refactor: migrate DocumentSegmentSummary to TypeBase (#34862) 2026-04-17 06:58:32 +00:00
Junghwan
de15e5b449 fix: scope plugin inner API end-user lookup by tenant (#35325) 2026-04-17 06:12:07 +00:00
HeYinKazune
af8ffa0654 refactor: use sessionmaker in api_tools_manage_service.py (#34892) 
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-04-17 05:07:12 +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
jerryzai
f07f9ee7a3 chore(api): migrate event handlers to use Session(db.engine) (#35234) 2026-04-17 03:59:41 +00:00
dependabot[bot]
7396230223 chore(deps): bump pypdf from 6.10.1 to 6.10.2 in /api (#35339) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-04-17 03:41:02 +00:00
dependabot[bot]
ed14f58697 chore(deps): bump mako from 1.3.10 to 1.3.11 in /api (#35340) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-04-17 03:40:58 +00:00
dependabot[bot]
37714cb44e chore(deps): bump authlib from 1.6.9 to 1.6.11 in /api (#35341) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-04-17 03:40:49 +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
FFXN
459a12cd9d snippet 2026-04-16 16:14:03 +08:00
James
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
jimcody1995
7f4fe4d064 test: migrate clean notion task tests to SQLAlchemy 2.0 APIs (#35159) 2026-04-16 07:52:11 +00:00
hjlarry
b491ea53c5 fix: improve i18n and comment default uuidv7 2026-04-16 15:18:06 +08:00
Ayush Baluni
54e51be665 fix: apply score threshold after reranking in hybrid search (#35263) 2026-04-16 06:21:11 +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
6de81c403d fix uv.lock 2026-04-16 12:57:34 +08:00
JzoNg
ac2104581b fix merge confilcts of evaluation-fe 2026-04-16 12:47:16 +08:00
NVIDIAN
25df902ec4 refactor(api): add BaseModel workflow field schemas (#35297) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-16 04:39:59 +00:00
NVIDIAN
5956dd79df refactor(api): add BaseModel conversation variable schemas (#35296) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-16 04:39:30 +00:00
bohdansolovie
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
dependabot[bot]
731414a44f chore(deps): bump pypdf from 6.10.0 to 6.10.1 in /api (#35273) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-04-16 04:36:03 +00:00
dependabot[bot]
987b5f4bf4 chore(deps): bump langsmith from 0.7.30 to 0.7.31 in /api (#35288) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2026-04-16 04:35:21 +00: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