[ML] Require basic licence for the Elastic Inference Service #137434
There are no files selected for viewing
This file contains hidden or 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,5 @@ | ||
| pr: 137434 | ||
| summary: Require basic licence for the Elastic Inference Service | ||
| area: Machine Learning | ||
| type: enhancement | ||
| issues: [] |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,38 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.inference; | ||
|
|
||
| import org.elasticsearch.ElasticsearchSecurityException; | ||
| import org.elasticsearch.license.LicenseUtils; | ||
| import org.elasticsearch.license.XPackLicenseState; | ||
| import org.elasticsearch.xpack.core.XPackField; | ||
| import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService; | ||
|
|
||
| import static org.elasticsearch.xpack.inference.InferencePlugin.EIS_INFERENCE_FEATURE; | ||
| import static org.elasticsearch.xpack.inference.InferencePlugin.INFERENCE_API_FEATURE; | ||
|
|
||
| public class InferenceLicenceCheck { | ||
|
|
||
| private InferenceLicenceCheck() {} | ||
|
|
||
| public static boolean isServiceLicenced(String serviceName, XPackLicenseState licenseState) { | ||
| if (ElasticInferenceService.NAME.equals(serviceName)) { | ||
| return EIS_INFERENCE_FEATURE.check(licenseState); | ||
| } else { | ||
| return INFERENCE_API_FEATURE.check(licenseState); | ||
| } | ||
| } | ||
|
|
||
| public static ElasticsearchSecurityException complianceException(String serviceName) { | ||
| if (ElasticInferenceService.NAME.equals(serviceName)) { | ||
| return LicenseUtils.newComplianceException(XPackField.ELASTIC_INFERENCE_SERVICE); | ||
| } else { | ||
| return LicenseUtils.newComplianceException(XPackField.INFERENCE); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -48,7 +48,6 @@ | |
| import org.elasticsearch.inference.Model; | ||
| import org.elasticsearch.inference.UnparsedModel; | ||
| import org.elasticsearch.inference.telemetry.InferenceStats; | ||
| import org.elasticsearch.license.XPackLicenseState; | ||
| import org.elasticsearch.rest.RestStatus; | ||
| import org.elasticsearch.tasks.Task; | ||
|
|
@@ -57,10 +56,10 @@ | |
| import org.elasticsearch.xcontent.XContentParser; | ||
| import org.elasticsearch.xcontent.XContentParserConfiguration; | ||
| import org.elasticsearch.xcontent.XContentType; | ||
| import org.elasticsearch.xpack.core.inference.chunking.ChunkingSettingsBuilder; | ||
| import org.elasticsearch.xpack.core.inference.results.ChunkedInferenceError; | ||
| import org.elasticsearch.xpack.inference.InferenceException; | ||
| import org.elasticsearch.xpack.inference.InferenceLicenceCheck; | ||
| import org.elasticsearch.xpack.inference.mapper.SemanticTextField; | ||
| import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper; | ||
| import org.elasticsearch.xpack.inference.mapper.SemanticTextUtils; | ||
|
|
@@ -78,7 +77,6 @@ | |
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.elasticsearch.inference.telemetry.InferenceStats.serviceAndResponseAttributes; | ||
| import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.toSemanticTextFieldChunks; | ||
| import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.toSemanticTextFieldChunksLegacy; | ||
|
|
||
|
|
@@ -383,6 +381,19 @@ public void onFailure(Exception exc) { | |
| modelRegistry.getModelWithSecrets(inferenceId, modelLoadingListener); | ||
| return; | ||
| } | ||
|
|
||
| if (InferenceLicenceCheck.isServiceLicenced(inferenceProvider.service.name(), licenseState) == false) { | ||
| try (onFinish) { | ||
| for (FieldInferenceRequest request : requests) { | ||
| addInferenceResponseFailure( | ||
| request.bulkItemIndex, | ||
| InferenceLicenceCheck.complianceException(inferenceProvider.service.name()) | ||
| ); | ||
| } | ||
| return; | ||
| } | ||
| } | ||
|
Comment on lines
385
to
393
Member
There was a problem hiding this comment. @carlosdelest what do you think of this? It seems OK to me. Both the old and new license check failures are per bulk item request. Now we just delay it until we have the inference provider loaded.
Member
There was a problem hiding this comment. That makes sense - we're checking the inference provider service when we have it. As requests are grouped by inference provider, we can fail all of them at once in case it's not compliant. 👍 |
||
|
|
||
| final List<ChunkInferenceInput> inputs = requests.stream() | ||
| .map(r -> new ChunkInferenceInput(r.input, r.chunkingSettings)) | ||
| .collect(Collectors.toList()); | ||
|
|
@@ -571,11 +582,6 @@ private long addFieldInferenceRequests(BulkItemRequest item, int itemIndex, Map< | |
| break; | ||
| } | ||
|
|
||
| List<FieldInferenceRequest> requests = requestsMap.computeIfAbsent(inferenceId, k -> new ArrayList<>()); | ||
| int offsetAdjustment = 0; | ||
| for (String v : values) { | ||
|
|
||
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.
Its a bit confusing to me, the
ElasticInferenceService.NAMEiselastic, but our license service name iseis. So the user configureselasticto get the license with nameeis.Could we name this
elasticto match the name of theElasticInferenceService.NAME?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.
I've changed this to the proper name "Elastic Inference Service"
The error the user sees if the licence is not compatible is either:
Or