Skip to content

[9.0] Fix deploying custom models with adaptive allocations (#126276) #126317

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
merged 1 commit into from
Apr 4, 2025
Merged

[9.0] Fix deploying custom models with adaptive allocations (#126276) #126317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ack/inference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private static CommonFields commonFieldsFromMap(Map<String, Object> map, Validat
private final DenseVectorFieldMapper.ElementType elementType;

CustomElandInternalTextEmbeddingServiceSettings(
int numAllocations,
Integer numAllocations,
int numThreads,
String modelId,
AdaptiveAllocationsSettings adaptiveAllocationsSettings,
Expand Down
17 changes: 9 additions & 8 deletions ...nference/services/elasticsearch/CustomElandInternalTextEmbeddingServiceSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.XContentFactory;
import org.elasticsearch.xcontent.XContentType;
import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
import org.elasticsearch.xpack.inference.services.ServiceFields;

Expand All @@ -31,23 +32,23 @@ public class CustomElandInternalTextEmbeddingServiceSettingsTests extends Abstra
CustomElandInternalTextEmbeddingServiceSettings> {

public static CustomElandInternalTextEmbeddingServiceSettings createRandom() {
var numAllocations = randomIntBetween(1, 10);
var withAdaptiveAllocations = randomBoolean();
var numAllocations = withAdaptiveAllocations ? null : randomIntBetween(1, 10);
var adaptiveAllocationsSettings = withAdaptiveAllocations
? new AdaptiveAllocationsSettings(true, randomIntBetween(0, 2), randomIntBetween(2, 5))
: null;
var numThreads = randomIntBetween(1, 10);
var modelId = randomAlphaOfLength(8);
SimilarityMeasure similarityMeasure = SimilarityMeasure.COSINE;
Integer dims = null;
var similarityMeasure = SimilarityMeasure.COSINE;
var setDimensions = randomBoolean();
if (setDimensions) {
dims = 123;
}

var dims = setDimensions ? 123 : null;
var elementType = randomFrom(DenseVectorFieldMapper.ElementType.values());

return new CustomElandInternalTextEmbeddingServiceSettings(
numAllocations,
numThreads,
modelId,
null,
adaptiveAllocationsSettings,
null,
dims,
similarityMeasure,
Expand Down