-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.x' into backport/backport-956-to-2.x
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
- Loading branch information
Showing
13 changed files
with
2,051 additions
and
27 deletions.
There are no files selected for viewing
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
189 changes: 189 additions & 0 deletions
189
src/main/java/org/opensearch/neuralsearch/processor/rerank/ByFieldRerankProcessor.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,189 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.opensearch.neuralsearch.processor.rerank; | ||
|
|
||
| import lombok.extern.log4j.Log4j2; | ||
| import org.opensearch.action.search.SearchResponse; | ||
| import org.opensearch.common.xcontent.XContentType; | ||
| import org.opensearch.core.action.ActionListener; | ||
| import org.opensearch.core.common.bytes.BytesReference; | ||
| import org.opensearch.core.xcontent.XContentBuilder; | ||
| import org.opensearch.neuralsearch.processor.rerank.context.ContextSourceFetcher; | ||
| import org.opensearch.neuralsearch.processor.util.ProcessorUtils.SearchHitValidator; | ||
| import org.opensearch.search.SearchHit; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.opensearch.neuralsearch.processor.util.ProcessorUtils.getScoreFromSourceMap; | ||
| import static org.opensearch.neuralsearch.processor.util.ProcessorUtils.getValueFromSource; | ||
| import static org.opensearch.neuralsearch.processor.util.ProcessorUtils.mappingExistsInSource; | ||
| import static org.opensearch.neuralsearch.processor.util.ProcessorUtils.removeTargetFieldFromSource; | ||
| import static org.opensearch.neuralsearch.processor.util.ProcessorUtils.validateRerankCriteria; | ||
|
|
||
| /** | ||
| * A reranking processor that reorders search results based on the content of a specified field. | ||
| * <p> | ||
| * The ByFieldRerankProcessor allows for reordering of search results by considering the content of a | ||
| * designated target field within each document. This processor will update the <code>_score</code> field with what has been provided | ||
| * by {@code target_field}. When {@code keep_previous_score} is enabled a new field is appended called <code>previous_score</code> which was the score prior to reranking. | ||
| * <p> | ||
| * Key features: | ||
| * <ul> | ||
| * <li>Reranks search results based on a specified target field</li> | ||
| * <li>Optionally removes the target field from the final search results</li> | ||
| * <li>Supports nested field structures using dot notation</li> | ||
| * </ul> | ||
| * <p> | ||
| * The processor uses the following configuration parameters: | ||
| * <ul> | ||
| * <li>{@code target_field}: The field to be used for reranking (required)</li> | ||
| * <li>{@code remove_target_field}: Whether to remove the target field from the final results (optional, default: false)</li> | ||
| * <li>{@code keep_previous_score}: Whether to append the previous score in a field called <code>previous_score</code> (optional, default: false)</li> | ||
| * </ul> | ||
| * <p> | ||
| * Usage example: | ||
| * <pre> | ||
| * { | ||
| * "rerank": { | ||
| * "by_field": { | ||
| * "target_field": "document.relevance_score", | ||
| * "remove_target_field": true, | ||
| * "keep_previous_score": false | ||
| * } | ||
| * } | ||
| * } | ||
| * </pre> | ||
| * <p> | ||
| * This processor is useful in scenarios where additional, document-specific | ||
| * information stored in a field can be used to improve the relevance of search results | ||
| * beyond the initial scoring. | ||
| */ | ||
| @Log4j2 | ||
| public class ByFieldRerankProcessor extends RescoringRerankProcessor { | ||
|
|
||
| public static final String TARGET_FIELD = "target_field"; | ||
| public static final String REMOVE_TARGET_FIELD = "remove_target_field"; | ||
| public static final String KEEP_PREVIOUS_SCORE = "keep_previous_score"; | ||
|
|
||
| public static final boolean DEFAULT_REMOVE_TARGET_FIELD = false; | ||
| public static final boolean DEFAULT_KEEP_PREVIOUS_SCORE = false; | ||
|
|
||
| protected final String targetField; | ||
| protected final boolean removeTargetField; | ||
| protected final boolean keepPreviousScore; | ||
|
|
||
| /** | ||
| * Constructor to pass values to the RerankProcessor constructor. | ||
| * | ||
| * @param description The description of the processor | ||
| * @param tag The processor's identifier | ||
| * @param ignoreFailure If true, OpenSearch ignores any failure of this processor and | ||
| * continues to run the remaining processors in the search pipeline. | ||
| * @param targetField The field you want to replace your <code>_score</code> with | ||
| * @param removeTargetField A flag to let you delete the target_field for better visualization (i.e. removes a duplicate value) | ||
| * @param keepPreviousScore A flag to let you decide to stash your previous <code>_score</code> in a field called <code>previous_score</code> (i.e. for debugging purposes) | ||
| * @param contextSourceFetchers Context from some source and puts it in a map for a reranking processor to use <b> (Unused in ByFieldRerankProcessor)</b> | ||
| */ | ||
| public ByFieldRerankProcessor( | ||
| final String description, | ||
| final String tag, | ||
| final boolean ignoreFailure, | ||
| final String targetField, | ||
| final boolean removeTargetField, | ||
| final boolean keepPreviousScore, | ||
| final List<ContextSourceFetcher> contextSourceFetchers | ||
| ) { | ||
| super(RerankType.BY_FIELD, description, tag, ignoreFailure, contextSourceFetchers); | ||
| this.targetField = targetField; | ||
| this.removeTargetField = removeTargetField; | ||
| this.keepPreviousScore = keepPreviousScore; | ||
| } | ||
|
|
||
| @Override | ||
| public void rescoreSearchResponse( | ||
| final SearchResponse response, | ||
| final Map<String, Object> rerankingContext, | ||
| final ActionListener<List<Float>> listener | ||
| ) { | ||
| SearchHit[] searchHits = response.getHits().getHits(); | ||
|
|
||
| SearchHitValidator searchHitValidator = this::byFieldSearchHitValidator; | ||
|
|
||
| if (!validateRerankCriteria(searchHits, searchHitValidator, listener)) { | ||
| return; | ||
| } | ||
|
|
||
| List<Float> scores = new ArrayList<>(searchHits.length); | ||
|
|
||
| for (SearchHit hit : searchHits) { | ||
| Map<String, Object> sourceAsMap = hit.getSourceAsMap(); | ||
|
|
||
| float score = getScoreFromSourceMap(sourceAsMap, targetField); | ||
| scores.add(score); | ||
|
|
||
| if (keepPreviousScore) { | ||
| sourceAsMap.put("previous_score", hit.getScore()); | ||
| } | ||
|
|
||
| if (removeTargetField) { | ||
| removeTargetFieldFromSource(sourceAsMap, targetField); | ||
| } | ||
|
|
||
| try { | ||
| XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent()); | ||
| BytesReference sourceMapAsBytes = BytesReference.bytes(builder.map(sourceAsMap)); | ||
| hit.sourceRef(sourceMapAsBytes); | ||
| } catch (IOException e) { | ||
| log.error(e.getMessage()); | ||
| listener.onFailure(new RuntimeException(e)); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| listener.onResponse(scores); | ||
| } | ||
|
|
||
| /** | ||
| * Implements the behavior of the SearchHit validator {@code SearchHitValidator} | ||
| * It checks all the following | ||
| * <ul> | ||
| * <li>Checks the search hit has a source mapping</li> | ||
| * <li>Checks that the mapping exists in the source mapping using the target_field</li> | ||
| * <li>Checks that the mapping has a numerical score for it to rerank</li> | ||
| * </ul> | ||
| * @param hit A search hit to validate | ||
| */ | ||
| public void byFieldSearchHitValidator(final SearchHit hit) { | ||
| if (!hit.hasSource()) { | ||
| log.error(String.format(Locale.ROOT, "There is no source field to be able to perform rerank on hit [%d]", hit.docId())); | ||
| throw new IllegalArgumentException( | ||
| String.format(Locale.ROOT, "There is no source field to be able to perform rerank on hit [%d]", hit.docId()) | ||
| ); | ||
| } | ||
|
|
||
| Map<String, Object> sourceMap = hit.getSourceAsMap(); | ||
| if (!mappingExistsInSource(sourceMap, targetField)) { | ||
| log.error(String.format(Locale.ROOT, "The field to rerank [%s] is not found at hit [%d]", targetField, hit.docId())); | ||
|
|
||
| throw new IllegalArgumentException(String.format(Locale.ROOT, "The field to rerank by is not found at hit [%d]", hit.docId())); | ||
| } | ||
|
|
||
| Optional<Object> val = getValueFromSource(sourceMap, targetField); | ||
|
|
||
| if (!(val.get() instanceof Number)) { | ||
| log.error(String.format(Locale.ROOT, "The field mapping to rerank [%s: %s] is not Numerical", targetField, val.orElse(null))); | ||
|
|
||
| throw new IllegalArgumentException( | ||
| String.format(Locale.ROOT, "The field mapping to rerank by [%s] is not Numerical", val.orElse(null)) | ||
| ); | ||
| } | ||
|
|
||
| } | ||
| } |
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.