Skip to content

Fix numeric type preservation in ML inference query template substitution #4656

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.

Sign up for GitHub

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

Merged
dhrubo-os merged 5 commits into from
Feb 24, 2026
Merged

Fix numeric type preservation in ML inference query template substitution #4656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30da4ca
fix: fix integ test for ML inference range query rewrite
dhrubo-os Feb 24, 2026
1f092f5
fix: revert manual substitution, restore StringSubstitutor
dhrubo-os Feb 24, 2026
4825156
test: remove unnecessary unit test for numeric type preservation
dhrubo-os Feb 24, 2026
64db88c
test: restore missing javadoc for testExecute_rewriteListFromTermQuer…
dhrubo-os Feb 24, 2026
2195b95
Merge branch 'main' into main
dhrubo-os Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,13 @@ def _numNodes = findProperty('numNodes') as Integer ?: 1
test {
include '**/*Tests.class'
systemProperty 'tests.security.manager', 'false'
// In FIPS mode, bc-fips is excluded from the plugin bundle to avoid jar hell with OpenSearch core.
// Unit tests don't run inside OpenSearch, so we add bc-fips directly to the test classpath.
if (FipsBuildParams.isInFipsMode()) {
classpath += configurations.detachedConfiguration(
dependencies.create("org.bouncycastle:bc-fips:2.1.2")
)
}
}

def opensearch_tmp_dir = rootProject.file('build/private/opensearch_tmp').absoluteFile
Expand Down
6 changes: 2 additions & 4 deletions plugin/src/test/java/org/opensearch/ml/rest/RestMLInferenceSearchRequestProcessorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ public class RestMLInferenceSearchRequestProcessorIT extends MLCommonsRestTestCa
+ " \"content-type\": \"application/json\",\n"
+ " \"x-amz-content-sha256\": \"required\"\n"
+ " },\n"
+ " \"request_body\": \"{ \\\"inputText\\\": \\\"${parameters.input}\\\" }\",\n"
+ " \"pre_process_function\": \"connector.pre_process.bedrock.embedding\",\n"
+ " \"post_process_function\": \"connector.post_process.bedrock.embedding\"\n"
+ " \"request_body\": \"{ \\\"inputText\\\": \\\"${parameters.input}\\\" }\"\n"
+ " }\n"
+ " ]\n"
+ "}";
Expand Down Expand Up @@ -343,7 +341,7 @@ public void testMLInferenceProcessorRemoteModelRewriteQueryType() throws Excepti
+ " \"model_id\": \""
+ this.bedrockEmbeddingModelId
+ "\",\n"
+ " \"query_template\": \"{\\\"query\\\":{\\\"range\\\":{\\\"diary_embedding_size\\\":{\\\"lte\\\":${modelPrediction}}}}}\",\n"
+ " \"query_template\": \"{\\\"query\\\":{\\\"range\\\":{\\\"diary_embedding_size_int\\\":{\\\"lte\\\":${modelPrediction}}}}}\",\n"
+ " \"input_map\": [\n"
+ " {\n"
+ " \"input\": \"query.term.diary_embedding_size.value\"\n"
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/test/java/org/opensearch/ml/rest/RestMLRAGSearchProcessorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ public class RestMLRAGSearchProcessorIT extends MLCommonsRestTestCase {
+ "\"\n"
+ " },\n"
+ " \"parameters\": {\n"
+ " \"model\": \"command-a-03-2025\"\n"
+ " \"model\": \"command-r-08-2024\"\n"
+ " },\n"
+ " \"actions\": [\n"
+ " {\n"
Expand Down
Loading