Skip to content
Merged
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,15 @@ public void parseRequestConfig(
);
platformArch.accept(
modelListener.delegateFailureAndWrap(
(delegate, arch) -> elserCase(inferenceEntityId, taskType, config, arch, serviceSettingsMap, modelListener)
(delegate, arch) -> elserCase(
inferenceEntityId,
taskType,
config,
arch,
serviceSettingsMap,
modelListener,
true
)
)
);
} else {
Expand All @@ -148,7 +156,15 @@ public void parseRequestConfig(
} else if (ElserModels.isValidModel(modelId)) {
platformArch.accept(
modelListener.delegateFailureAndWrap(
(delegate, arch) -> elserCase(inferenceEntityId, taskType, config, arch, serviceSettingsMap, modelListener)
(delegate, arch) -> elserCase(
inferenceEntityId,
taskType,
config,
arch,
serviceSettingsMap,
modelListener,
OLD_ELSER_SERVICE_NAME.equals(serviceName)
)
)
);
} else {
Expand Down Expand Up @@ -298,7 +314,8 @@ private void elserCase(
Map<String, Object> config,
Set<String> platformArchitectures,
Map<String, Object> serviceSettingsMap,
ActionListener<Model> modelListener
ActionListener<Model> modelListener,
boolean isElserService
) {
var esServiceSettingsBuilder = ElasticsearchInternalServiceSettings.fromRequestMap(serviceSettingsMap);
final String defaultModelId = selectDefaultModelVariantBasedOnClusterArchitecture(
Expand Down Expand Up @@ -327,15 +344,17 @@ private void elserCase(
}
}

DEPRECATION_LOGGER.warn(
DeprecationCategory.API,
"inference_api_elser_service",
"The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
+ " [model_id] set to [{}] in the [service_settings]",
OLD_ELSER_SERVICE_NAME,
ElasticsearchInternalService.NAME,
defaultModelId
);
if (isElserService) {
DEPRECATION_LOGGER.warn(
DeprecationCategory.API,
"inference_api_elser_service",
"The [{}] service is deprecated and will be removed in a future release. Use the [{}] service instead, with"
+ " [model_id] set to [{}] in the [service_settings]",
OLD_ELSER_SERVICE_NAME,
ElasticsearchInternalService.NAME,
defaultModelId
);
}

if (modelVariantDoesNotMatchArchitecturesAndIsNotPlatformAgnostic(platformArchitectures, esServiceSettingsBuilder.getModelId())) {
throw new IllegalArgumentException(
Expand Down
Loading