outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Reranking mode is null

Browse Source
This commit is contained in:
jyong 2024-08-06 19:03:32 +08:00
parent a3c2ab9a6e
commit 2ab04bb933
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/core/rag/retrieval/dataset_retrieval.py
View File

@ -436,7 +436,8 @@ class DatasetRetrieval:
if retrieval_model['score_threshold_enabled'] else None, if retrieval_model['score_threshold_enabled'] else None,
reranking_model=retrieval_model.get('reranking_model', None) reranking_model=retrieval_model.get('reranking_model', None)
if retrieval_model['reranking_enable'] else None, if retrieval_model['reranking_enable'] else None,
reranking_mode=retrieval_model.get('reranking_mode', 'reranking_model'), reranking_mode=retrieval_model.get('reranking_mode')
if retrieval_model.get('reranking_mode') else 'reranking_model',
weights=retrieval_model.get('weights', None), weights=retrieval_model.get('weights', None),
) )

3
api/core/tools/tool/dataset_retriever/dataset_multi_retriever_tool.py
View File

@ -181,7 +181,8 @@ class DatasetMultiRetrieverTool(DatasetRetrieverBaseTool):
if retrieval_model['score_threshold_enabled'] else None, if retrieval_model['score_threshold_enabled'] else None,
reranking_model=retrieval_model.get('reranking_model', None) reranking_model=retrieval_model.get('reranking_model', None)
if retrieval_model['reranking_enable'] else None, if retrieval_model['reranking_enable'] else None,
reranking_mode=retrieval_model.get('reranking_mode', 'reranking_model'), reranking_mode=retrieval_model.get('reranking_mode')
if retrieval_model.get('reranking_mode') else 'reranking_model',
weights=retrieval_model.get('weights', None), weights=retrieval_model.get('weights', None),
) )

3
api/core/tools/tool/dataset_retriever/dataset_retriever_tool.py
View File

@ -79,7 +79,8 @@ class DatasetRetrieverTool(DatasetRetrieverBaseTool):
score_threshold=retrieval_model.get('score_threshold', .0) score_threshold=retrieval_model.get('score_threshold', .0)
if retrieval_model['score_threshold_enabled'] else None, if retrieval_model['score_threshold_enabled'] else None,
reranking_model=retrieval_model.get('reranking_model', None), reranking_model=retrieval_model.get('reranking_model', None),
reranking_mode=retrieval_model.get('reranking_mode', 'reranking_model'), reranking_mode=retrieval_model.get('reranking_mode')
if retrieval_model.get('reranking_mode') else 'reranking_model',
weights=retrieval_model.get('weights', None), weights=retrieval_model.get('weights', None),
) )
else: else:

3
api/services/hit_testing_service.py
View File

@ -45,7 +45,8 @@ class HitTestingService:
score_threshold=retrieval_model.get('score_threshold', .0) score_threshold=retrieval_model.get('score_threshold', .0)
if retrieval_model['score_threshold_enabled'] else None, if retrieval_model['score_threshold_enabled'] else None,
reranking_model=retrieval_model.get('reranking_model', None), reranking_model=retrieval_model.get('reranking_model', None),
reranking_mode=retrieval_model.get('reranking_mode', 'reranking_model'), reranking_mode=retrieval_model.get('reranking_mode')
if retrieval_model.get('reranking_mode') else 'reranking_model',
weights=retrieval_model.get('weights', None), weights=retrieval_model.get('weights', None),
) )