Skip to content

[ML] Check for default endpoints first #133121

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

Closed
wants to merge 2 commits into from
Closed

[ML] Check for default endpoints first #133121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a0c4b
Get defaults first
davidkyle Aug 19, 2025
ac5b224
don't persist
davidkyle Aug 19, 2025
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
27 changes: 15 additions & 12 deletions ...gin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,17 @@ public MinimalServiceSettings getMinimalServiceSettings(String inferenceEntityId
* @param listener Model listener
*/
public void getModelWithSecrets(String inferenceEntityId, ActionListener<UnparsedModel> listener) {
var maybeDefault = defaultConfigIds.get(inferenceEntityId);
if (maybeDefault != null) {
getDefaultConfig(false, maybeDefault, listener);
logger.debug("Returning default inference endpoint [{}] with secrets", inferenceEntityId);
return;
}

ActionListener<SearchResponse> searchListener = ActionListener.wrap((searchResponse) -> {
// There should be a hit for the configurations
if (searchResponse.getHits().getHits().length == 0) {
var maybeDefault = defaultConfigIds.get(inferenceEntityId);
if (maybeDefault != null) {
getDefaultConfig(true, maybeDefault, listener);
} else {
listener.onFailure(inferenceNotFoundException(inferenceEntityId));
}
listener.onFailure(inferenceNotFoundException(inferenceEntityId));
return;
}

Expand Down Expand Up @@ -289,15 +291,16 @@ public void getModelWithSecrets(String inferenceEntityId, ActionListener<Unparse
* @param listener Model listener
*/
public void getModel(String inferenceEntityId, ActionListener<UnparsedModel> listener) {
var maybeDefault = defaultConfigIds.get(inferenceEntityId);
if (maybeDefault != null) {
getDefaultConfig(false, maybeDefault, listener);
return;
}

ActionListener<SearchResponse> searchListener = ActionListener.wrap((searchResponse) -> {
// There should be a hit for the configurations
if (searchResponse.getHits().getHits().length == 0) {
var maybeDefault = defaultConfigIds.get(inferenceEntityId);
if (maybeDefault != null) {
getDefaultConfig(true, maybeDefault, listener);
} else {
listener.onFailure(inferenceNotFoundException(inferenceEntityId));
}
listener.onFailure(inferenceNotFoundException(inferenceEntityId));
return;
}

Expand Down