Skip to content

Commit cc14b18

Browse files
Refactor Llama request classes to improve secret settings handling
1 parent 727fd8e commit cc14b18

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/completion/LlamaChatCompletionRequest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ public HttpRequest createHttpRequest() {
4444
httpPost.setEntity(byteEntity);
4545

4646
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaTypeWithoutParameters());
47-
if (model.getSecretSettings() instanceof DefaultSecretSettings(org.elasticsearch.common.settings.SecureString apiKey)) {
48-
httpPost.setHeader(createAuthBearerHeader(apiKey));
47+
if (model.getSecretSettings() instanceof DefaultSecretSettings) {
48+
var secretSettings = (DefaultSecretSettings) model.getSecretSettings();
49+
httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));
4950
}
5051

5152
return new HttpRequest(httpPost, getInferenceEntityId());

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/llama/request/embeddings/LlamaEmbeddingsRequest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ public HttpRequest createHttpRequest() {
4848
httpPost.setEntity(byteEntity);
4949

5050
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaType());
51-
if (model.getSecretSettings() instanceof DefaultSecretSettings(org.elasticsearch.common.settings.SecureString apiKey)) {
52-
httpPost.setHeader(createAuthBearerHeader(apiKey));
51+
if (model.getSecretSettings() instanceof DefaultSecretSettings) {
52+
var secretSettings = (DefaultSecretSettings) model.getSecretSettings();
53+
httpPost.setHeader(createAuthBearerHeader(secretSettings.apiKey()));
5354
}
5455

5556
return new HttpRequest(httpPost, getInferenceEntityId());

0 commit comments

Comments
 (0)