Skip to content

Commit 06dd9b3

Browse files
authored
[ML] Fix model registry upgrade tests (#125774)
1 parent ff6a463 commit 06dd9b3

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

muted-tests.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -465,30 +465,12 @@ tests:
465465
- class: org.elasticsearch.qa.verify_version_constants.VerifyVersionConstantsIT
466466
method: testLuceneVersionConstant
467467
issue: https://github.com/elastic/elasticsearch/issues/125638
468-
- class: org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT
469-
method: testElser {upgradedNodes=2}
470-
issue: https://github.com/elastic/elasticsearch/issues/125550
471-
- class: org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT
472-
method: testHFEmbeddings {upgradedNodes=3}
473-
issue: https://github.com/elastic/elasticsearch/issues/125543
474-
- class: org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT
475-
method: testElser {upgradedNodes=3}
476-
issue: https://github.com/elastic/elasticsearch/issues/125544
477-
- class: org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
478-
method: testUpgradeModels {upgradedNodes=3}
479-
issue: https://github.com/elastic/elasticsearch/issues/125535
480-
- class: org.elasticsearch.xpack.application.ModelRegistryUpgradeIT
481-
method: testUpgradeModels {upgradedNodes=0}
482-
issue: https://github.com/elastic/elasticsearch/issues/125549
483468
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
484469
method: test {date.Implicit casting strings to dates for IN operator ASYNC}
485470
issue: https://github.com/elastic/elasticsearch/issues/121490
486471
- class: org.elasticsearch.packaging.test.DebPreservationTests
487472
method: test40RestartOnUpgrade
488473
issue: https://github.com/elastic/elasticsearch/issues/125821
489-
- class: org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT
490-
method: testHFEmbeddings {upgradedNodes=2}
491-
issue: https://github.com/elastic/elasticsearch/issues/125551
492474
- class: org.elasticsearch.xpack.downsample.DataStreamLifecycleDownsampleDisruptionIT
493475
method: testDataStreamLifecycleDownsampleRollingRestart
494476
issue: https://github.com/elastic/elasticsearch/issues/123769

x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/ModelRegistryUpgradeIT.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
import com.carrotsearch.randomizedtesting.annotations.Name;
1111

12-
import org.elasticsearch.common.Strings;
13-
import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
14-
import org.elasticsearch.inference.SimilarityMeasure;
1512
import org.elasticsearch.inference.TaskType;
1613
import org.elasticsearch.test.http.MockResponse;
1714
import org.elasticsearch.test.http.MockWebServer;
@@ -25,6 +22,7 @@
2522

2623
import static org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT.elserConfig;
2724
import static org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT.elserResponse;
25+
import static org.elasticsearch.xpack.application.HuggingFaceServiceUpgradeIT.embeddingConfig;
2826
import static org.hamcrest.Matchers.equalTo;
2927
import static org.hamcrest.Matchers.greaterThan;
3028

@@ -137,16 +135,4 @@ private String embeddingResponse(int numDimensions) {
137135
result.append("]]");
138136
return result.toString();
139137
}
140-
141-
static String embeddingConfig(String url) {
142-
return Strings.format("""
143-
{
144-
"service": "hugging_face",
145-
"service_settings": {
146-
"url": "%s",
147-
"api_key": "XXXX"
148-
}
149-
}
150-
""", url, randomFrom(DenseVectorFieldMapper.ElementType.values()), randomFrom(SimilarityMeasure.values()));
151-
}
152138
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/huggingface/HuggingFaceServiceSettings.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,11 @@ public URI uri() {
188188

189189
@Override
190190
public SimilarityMeasure similarity() {
191-
return similarity;
191+
// Default to cosine similarity if not set.
192+
// Inference endpoints created before 8.15 may not have this set,
193+
// after 8.15 the default is cosine similarity. Semantic text requires
194+
// a non-null similarity measure
195+
return similarity == null ? SimilarityMeasure.COSINE : similarity;
192196
}
193197

194198
@Override

0 commit comments

Comments
 (0)