Rename apikey config to better reflect it is a name in secret store

4 files changed, 9 insertions, 10 deletions

diff --git a/container-search/src/main/java/ai/vespa/llm/clients/ConfigurableLanguageModel.java b/container-search/src/main/java/ai/vespa/llm/clients/ConfigurableLanguageModel.java
index c4bba632127..bf09b20fa24 100644
--- a/container-search/src/main/java/ai/vespa/llm/clients/ConfigurableLanguageModel.java
+++ b/container-search/src/main/java/ai/vespa/llm/clients/ConfigurableLanguageModel.java
@@ -28,7 +28,7 @@ public abstract class ConfigurableLanguageModel implements LanguageModel {
 
     @Inject
     public ConfigurableLanguageModel(LlmClientConfig config, SecretStore secretStore) {
-        this.apiKey = findApiKeyInSecretStore(config.apiKey(), secretStore);  // is this implicitly assuming external store?
+        this.apiKey = findApiKeyInSecretStore(config.apiKeySecretName(), secretStore);
         this.endpoint = config.endpoint();
     }
 
@@ -68,5 +68,4 @@ public abstract class ConfigurableLanguageModel implements LanguageModel {
         params.setEndpoint(endpoint);
     }
 
-
 }
diff --git a/container-search/src/main/resources/configdefinitions/llm-client.def b/container-search/src/main/resources/configdefinitions/llm-client.def
index 009c5253082..6bfd95c3cf2 100755
--- a/container-search/src/main/resources/configdefinitions/llm-client.def
+++ b/container-search/src/main/resources/configdefinitions/llm-client.def
@@ -2,7 +2,7 @@
 package=ai.vespa.llm
 
 # The name of the secret containing the api key
-apiKey string default=""
+apiKeySecretName string default=""
 
 # Endpoint for LLM client - if not set reverts to default for client
 endpoint string default=""
diff --git a/container-search/src/test/java/ai/vespa/llm/clients/ConfigurableLanguageModelTest.java b/container-search/src/test/java/ai/vespa/llm/clients/ConfigurableLanguageModelTest.java
index 9c7cd6ad064..03f980633aa 100644
--- a/container-search/src/test/java/ai/vespa/llm/clients/ConfigurableLanguageModelTest.java
+++ b/container-search/src/test/java/ai/vespa/llm/clients/ConfigurableLanguageModelTest.java
@@ -96,10 +96,10 @@ public class ConfigurableLanguageModelTest {
         return new InferenceParameters(MockLLMClient.ACCEPTED_API_KEY, s -> lookupParameter(s, Collections.emptyMap()));
     }
 
-    private LlmClientConfig modelParams(String apiKey, String endpoint) {
+    private LlmClientConfig modelParams(String apiKeySecretName, String endpoint) {
         var config = new LlmClientConfig.Builder();
-        if (apiKey != null) {
-            config.apiKey(apiKey);
+        if (apiKeySecretName != null) {
+            config.apiKeySecretName(apiKeySecretName);
         }
         if (endpoint != null) {
             config.endpoint(endpoint);
diff --git a/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java b/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java
index ec5617891e6..d4f1dbc00a4 100755
--- a/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java
+++ b/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java
@@ -197,28 +197,28 @@ public class LLMSearcherTest {
     }
 
     static MockLLMClient createLLMClient() {
-        var config = new LlmClientConfig.Builder().apiKey("api-key").build();
+        var config = new LlmClientConfig.Builder().apiKeySecretName("api-key").build();
         var secretStore = ConfigurableLanguageModelTest.createSecretStore(Map.of("api-key", MockLLMClient.ACCEPTED_API_KEY));
         var generator = createGenerator();
         return new MockLLMClient(config, secretStore, generator, null);
     }
 
     static MockLLMClient createLLMClient(String id) {
-        var config = new LlmClientConfig.Builder().apiKey("api-key").build();
+        var config = new LlmClientConfig.Builder().apiKeySecretName("api-key").build();
         var secretStore = ConfigurableLanguageModelTest.createSecretStore(Map.of("api-key", MockLLMClient.ACCEPTED_API_KEY));
         var generator = createIdGenerator(id);
         return new MockLLMClient(config, secretStore, generator, null);
     }
 
     static MockLLMClient createLLMClient(ExecutorService executor) {
-        var config = new LlmClientConfig.Builder().apiKey("api-key").build();
+        var config = new LlmClientConfig.Builder().apiKeySecretName("api-key").build();
         var secretStore = ConfigurableLanguageModelTest.createSecretStore(Map.of("api-key", MockLLMClient.ACCEPTED_API_KEY));
         var generator = createGenerator();
         return new MockLLMClient(config, secretStore, generator, executor);
     }
 
     static MockLLMClient createLLMClientWithoutSecretStore() {
-        var config = new LlmClientConfig.Builder().apiKey("api-key").build();
+        var config = new LlmClientConfig.Builder().apiKeySecretName("api-key").build();
         var secretStore = new SecretStoreProvider();
         var generator = createGenerator();
         return new MockLLMClient(config, secretStore.get(), generator, null);