From 51a0c4bb423a7e12f876d3fc2050230a1c3095f1 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 19 Aug 2025 11:28:00 +0100 Subject: [PATCH 1/2] Get defaults first --- .../inference/registry/ModelRegistry.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java index fe7c4a9395cd1..c8fc99ea25f16 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java @@ -249,15 +249,17 @@ public MinimalServiceSettings getMinimalServiceSettings(String inferenceEntityId * @param listener Model listener */ public void getModelWithSecrets(String inferenceEntityId, ActionListener listener) { + var maybeDefault = defaultConfigIds.get(inferenceEntityId); + if (maybeDefault != null) { + getDefaultConfig(true, maybeDefault, listener); + logger.debug("Returning default inference endpoint [{}] with secrets", inferenceEntityId); + return; + } + ActionListener 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; } @@ -289,15 +291,16 @@ public void getModelWithSecrets(String inferenceEntityId, ActionListener listener) { + var maybeDefault = defaultConfigIds.get(inferenceEntityId); + if (maybeDefault != null) { + getDefaultConfig(true, maybeDefault, listener); + return; + } + ActionListener 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; } From ac5b224588935c1867aff37a8860d7a7ea97a4cc Mon Sep 17 00:00:00 2001 From: David Kyle Date: Tue, 19 Aug 2025 15:24:29 +0100 Subject: [PATCH 2/2] don't persist --- .../elasticsearch/xpack/inference/registry/ModelRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java index c8fc99ea25f16..2be1e283bb80d 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java @@ -251,7 +251,7 @@ public MinimalServiceSettings getMinimalServiceSettings(String inferenceEntityId public void getModelWithSecrets(String inferenceEntityId, ActionListener listener) { var maybeDefault = defaultConfigIds.get(inferenceEntityId); if (maybeDefault != null) { - getDefaultConfig(true, maybeDefault, listener); + getDefaultConfig(false, maybeDefault, listener); logger.debug("Returning default inference endpoint [{}] with secrets", inferenceEntityId); return; } @@ -293,7 +293,7 @@ public void getModelWithSecrets(String inferenceEntityId, ActionListener listener) { var maybeDefault = defaultConfigIds.get(inferenceEntityId); if (maybeDefault != null) { - getDefaultConfig(true, maybeDefault, listener); + getDefaultConfig(false, maybeDefault, listener); return; }