jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: reranker OFF logic to preserve user setting (#15235)

Browse source 
Co-authored-by: crazywoola <427733928@qq.com>
This commit is contained in:
Hantaek Lim 2025-03-08 20:08:48 +09:00 • committed by GitHub
commit f7e012d216
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
web/app/components/workflow/nodes/knowledge-retrieval/utils.ts
View file

@ -154,7 +154,8 @@ export const getMultipleRetrievalConfig = (
result.reranking_mode = RerankingModeEnum.RerankingModel result.reranking_mode = RerankingModeEnum.RerankingModel
if (!result.reranking_model?.provider || !result.reranking_model?.model) { if (!result.reranking_model?.provider || !result.reranking_model?.model) {
if (rerankModelIsValid) { if (rerankModelIsValid) {
result.reranking_enable = true result.reranking_enable = reranking_enable !== false
result.reranking_model = { result.reranking_model = {
provider: validRerankModel?.provider || '', provider: validRerankModel?.provider || '',
model: validRerankModel?.model || '', model: validRerankModel?.model || '',
@ -168,7 +169,7 @@ export const getMultipleRetrievalConfig = (
} }
} }
else { else {
result.reranking_enable = true result.reranking_enable = reranking_enable !== false
} }
} }
@ -176,7 +177,8 @@ export const getMultipleRetrievalConfig = (
if (!reranking_mode) { if (!reranking_mode) {
if (validRerankModel?.provider && validRerankModel?.model) { if (validRerankModel?.provider && validRerankModel?.model) {
result.reranking_mode = RerankingModeEnum.RerankingModel result.reranking_mode = RerankingModeEnum.RerankingModel
result.reranking_enable = true result.reranking_enable = reranking_enable !== false
result.reranking_model = { result.reranking_model = {
provider: validRerankModel.provider, provider: validRerankModel.provider,
model: validRerankModel.model, model: validRerankModel.model,
@ -194,7 +196,8 @@ export const getMultipleRetrievalConfig = (
if (reranking_mode === RerankingModeEnum.WeightedScore && weights && shouldSetWeightDefaultValue) { if (reranking_mode === RerankingModeEnum.WeightedScore && weights && shouldSetWeightDefaultValue) {
if (rerankModelIsValid) { if (rerankModelIsValid) {
result.reranking_mode = RerankingModeEnum.RerankingModel result.reranking_mode = RerankingModeEnum.RerankingModel
result.reranking_enable = true result.reranking_enable = reranking_enable !== false
result.reranking_model = { result.reranking_model = {
provider: validRerankModel.provider || '', provider: validRerankModel.provider || '',
model: validRerankModel.model || '', model: validRerankModel.model || '',