-
Notifications
You must be signed in to change notification settings - Fork 73
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate explainability for hybrid query into RRF processor #1037
Merged
martin-gaievski
merged 2 commits into
opensearch-project:feature/rrf-score-normalization-v2
from
martin-gaievski:integrate_explain_feature_with_rrf
Dec 23, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
src/main/java/org/opensearch/neuralsearch/processor/AbstractScoreHybridizationProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
package org.opensearch.neuralsearch.processor; | ||
|
||
import org.opensearch.action.search.SearchPhaseContext; | ||
import org.opensearch.action.search.SearchPhaseResults; | ||
import org.opensearch.search.SearchPhaseResult; | ||
import org.opensearch.search.internal.SearchContext; | ||
import org.opensearch.search.pipeline.PipelineProcessingContext; | ||
import org.opensearch.search.pipeline.SearchPhaseResultsProcessor; | ||
|
||
import java.util.Optional; | ||
|
||
/** | ||
* Base class for all score hybridization processors. This class is responsible for executing the score hybridization process. | ||
* It is a pipeline processor that is executed after the query phase and before the fetch phase. | ||
*/ | ||
public abstract class AbstractScoreHybridizationProcessor implements SearchPhaseResultsProcessor { | ||
/** | ||
* Method abstracts functional aspect of score normalization and score combination. Exact methods for each processing stage | ||
* are set as part of class constructor. This method is called when there is no pipeline context | ||
* @param searchPhaseResult {@link SearchPhaseResults} DTO that has query search results. Results will be mutated as part of this method execution | ||
* @param searchPhaseContext {@link SearchContext} | ||
*/ | ||
@Override | ||
public <Result extends SearchPhaseResult> void process( | ||
final SearchPhaseResults<Result> searchPhaseResult, | ||
final SearchPhaseContext searchPhaseContext | ||
) { | ||
hybridizeScores(searchPhaseResult, searchPhaseContext, Optional.empty()); | ||
} | ||
|
||
/** | ||
* Method abstracts functional aspect of score normalization and score combination. Exact methods for each processing stage | ||
* are set as part of class constructor. This method is called when there is pipeline context | ||
* @param searchPhaseResult {@link SearchPhaseResults} DTO that has query search results. Results will be mutated as part of this method execution | ||
* @param searchPhaseContext {@link SearchContext} | ||
* @param requestContext {@link PipelineProcessingContext} processing context of search pipeline | ||
* @param <Result> | ||
*/ | ||
@Override | ||
public <Result extends SearchPhaseResult> void process( | ||
final SearchPhaseResults<Result> searchPhaseResult, | ||
final SearchPhaseContext searchPhaseContext, | ||
final PipelineProcessingContext requestContext | ||
) { | ||
hybridizeScores(searchPhaseResult, searchPhaseContext, Optional.ofNullable(requestContext)); | ||
} | ||
|
||
/** | ||
* Method abstracts functional aspect of score normalization and score combination. Exact methods for each processing stage | ||
* are set as part of class constructor | ||
* @param searchPhaseResult | ||
* @param searchPhaseContext | ||
* @param requestContextOptional | ||
* @param <Result> | ||
*/ | ||
abstract <Result extends SearchPhaseResult> void hybridizeScores( | ||
SearchPhaseResults<Result> searchPhaseResult, | ||
SearchPhaseContext searchPhaseContext, | ||
Optional<PipelineProcessingContext> requestContextOptional | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,27 +6,39 @@ | |
|
||
import lombok.ToString; | ||
import lombok.extern.log4j.Log4j2; | ||
import org.opensearch.neuralsearch.processor.explain.ExplainableTechnique; | ||
|
||
import java.util.Map; | ||
import java.util.List; | ||
import java.util.Objects; | ||
|
||
import static org.opensearch.neuralsearch.processor.explain.ExplanationUtils.describeCombinationTechnique; | ||
|
||
@Log4j2 | ||
/** | ||
* Abstracts combination of scores based on reciprocal rank fusion algorithm | ||
*/ | ||
@ToString(onlyExplicitlyIncluded = true) | ||
public class RRFScoreCombinationTechnique implements ScoreCombinationTechnique { | ||
public class RRFScoreCombinationTechnique implements ScoreCombinationTechnique, ExplainableTechnique { | ||
@ToString.Include | ||
public static final String TECHNIQUE_NAME = "rrf"; | ||
|
||
// Not currently using weights for RRF, no need to modify or verify these params | ||
public RRFScoreCombinationTechnique(final Map<String, Object> params, final ScoreCombinationUtil combinationUtil) {} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. those parameters were never used |
||
public RRFScoreCombinationTechnique() {} | ||
|
||
@Override | ||
public float combine(final float[] scores) { | ||
if (Objects.isNull(scores)) { | ||
throw new IllegalArgumentException("scores array cannot be null"); | ||
} | ||
float sumScores = 0.0f; | ||
for (float score : scores) { | ||
sumScores += score; | ||
} | ||
return sumScores; | ||
} | ||
|
||
@Override | ||
public String describe() { | ||
return describeCombinationTechnique(TECHNIQUE_NAME, List.of()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When sorting by a field other than
score
:searchHit.score
will beFloat.NaN
score
in the search hit and in actual response will benull
We can't pass
null
as a value for the explanation object. Therefore, I've set it to0.0
in these cases. This ensures that we always have a valid numeric value for the explanation, even when the score isn't the primary sorting factor.