Move LLM classes in vespajlib from ai.vespa.llm to ai.vespa.languagemodels

15 files changed, 68 insertions, 69 deletions

diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index 45e88ac2e94..c92d41edfd9 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -4077,7 +4077,7 @@
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.InferenceParameters" : {
+  "ai.vespa.languagemodels.InferenceParameters" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
     "attributes" : [
@@ -4097,7 +4097,7 @@
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.LanguageModel" : {
+  "ai.vespa.languagemodels.LanguageModel" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
     "attributes" : [
@@ -4106,12 +4106,12 @@
       "abstract"
     ],
     "methods" : [
-      "public abstract java.util.List complete(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters)",
-      "public abstract java.util.concurrent.CompletableFuture completeAsync(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters, java.util.function.Consumer)"
+      "public abstract java.util.List complete(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters)",
+      "public abstract java.util.concurrent.CompletableFuture completeAsync(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters, java.util.function.Consumer)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.LanguageModelException" : {
+  "ai.vespa.languagemodels.LanguageModelException" : {
     "superClass" : "java.lang.RuntimeException",
     "interfaces" : [ ],
     "attributes" : [
@@ -4123,22 +4123,22 @@
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.client.openai.OpenAiClient" : {
+  "ai.vespa.languagemodels.client.openai.OpenAiClient" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
-      "ai.vespa.llm.LanguageModel"
+      "ai.vespa.languagemodels.LanguageModel"
     ],
     "attributes" : [
       "public"
     ],
     "methods" : [
       "public void <init>()",
-      "public java.util.List complete(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters)",
-      "public java.util.concurrent.CompletableFuture completeAsync(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters, java.util.function.Consumer)"
+      "public java.util.List complete(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters)",
+      "public java.util.concurrent.CompletableFuture completeAsync(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters, java.util.function.Consumer)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.completion.Completion$FinishReason" : {
+  "ai.vespa.languagemodels.completion.Completion$FinishReason" : {
     "superClass" : "java.lang.Enum",
     "interfaces" : [ ],
     "attributes" : [
@@ -4147,17 +4147,17 @@
       "enum"
     ],
     "methods" : [
-      "public static ai.vespa.llm.completion.Completion$FinishReason[] values()",
-      "public static ai.vespa.llm.completion.Completion$FinishReason valueOf(java.lang.String)"
+      "public static ai.vespa.languagemodels.completion.Completion$FinishReason[] values()",
+      "public static ai.vespa.languagemodels.completion.Completion$FinishReason valueOf(java.lang.String)"
     ],
     "fields" : [
-      "public static final enum ai.vespa.llm.completion.Completion$FinishReason length",
-      "public static final enum ai.vespa.llm.completion.Completion$FinishReason stop",
-      "public static final enum ai.vespa.llm.completion.Completion$FinishReason none",
-      "public static final enum ai.vespa.llm.completion.Completion$FinishReason error"
+      "public static final enum ai.vespa.languagemodels.completion.Completion$FinishReason length",
+      "public static final enum ai.vespa.languagemodels.completion.Completion$FinishReason stop",
+      "public static final enum ai.vespa.languagemodels.completion.Completion$FinishReason none",
+      "public static final enum ai.vespa.languagemodels.completion.Completion$FinishReason error"
     ]
   },
-  "ai.vespa.llm.completion.Completion" : {
+  "ai.vespa.languagemodels.completion.Completion" : {
     "superClass" : "java.lang.Record",
     "interfaces" : [ ],
     "attributes" : [
@@ -4166,18 +4166,18 @@
       "record"
     ],
     "methods" : [
-      "public void <init>(java.lang.String, ai.vespa.llm.completion.Completion$FinishReason)",
+      "public void <init>(java.lang.String, ai.vespa.languagemodels.completion.Completion$FinishReason)",
       "public java.lang.String text()",
-      "public ai.vespa.llm.completion.Completion$FinishReason finishReason()",
-      "public static ai.vespa.llm.completion.Completion from(java.lang.String)",
-      "public static ai.vespa.llm.completion.Completion from(java.lang.String, ai.vespa.llm.completion.Completion$FinishReason)",
+      "public ai.vespa.languagemodels.completion.Completion$FinishReason finishReason()",
+      "public static ai.vespa.languagemodels.completion.Completion from(java.lang.String)",
+      "public static ai.vespa.languagemodels.completion.Completion from(java.lang.String, ai.vespa.languagemodels.completion.Completion$FinishReason)",
       "public final java.lang.String toString()",
       "public final int hashCode()",
       "public final boolean equals(java.lang.Object)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.completion.Prompt" : {
+  "ai.vespa.languagemodels.completion.Prompt" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
     "attributes" : [
@@ -4187,53 +4187,53 @@
     "methods" : [
       "public void <init>()",
       "public abstract java.lang.String asString()",
-      "public ai.vespa.llm.completion.Prompt append(ai.vespa.llm.completion.Completion)",
-      "public abstract ai.vespa.llm.completion.Prompt append(java.lang.String)"
+      "public ai.vespa.languagemodels.completion.Prompt append(ai.vespa.languagemodels.completion.Completion)",
+      "public abstract ai.vespa.languagemodels.completion.Prompt append(java.lang.String)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.completion.StringPrompt" : {
-    "superClass" : "ai.vespa.llm.completion.Prompt",
+  "ai.vespa.languagemodels.completion.StringPrompt" : {
+    "superClass" : "ai.vespa.languagemodels.completion.Prompt",
     "interfaces" : [ ],
     "attributes" : [
       "public"
     ],
     "methods" : [
       "public java.lang.String asString()",
-      "public ai.vespa.llm.completion.StringPrompt append(java.lang.String)",
-      "public ai.vespa.llm.completion.StringPrompt append(ai.vespa.llm.completion.Completion)",
+      "public ai.vespa.languagemodels.completion.StringPrompt append(java.lang.String)",
+      "public ai.vespa.languagemodels.completion.StringPrompt append(ai.vespa.languagemodels.completion.Completion)",
       "public java.lang.String toString()",
-      "public static ai.vespa.llm.completion.StringPrompt from(java.lang.String)",
-      "public bridge synthetic ai.vespa.llm.completion.Prompt append(java.lang.String)",
-      "public bridge synthetic ai.vespa.llm.completion.Prompt append(ai.vespa.llm.completion.Completion)"
+      "public static ai.vespa.languagemodels.completion.StringPrompt from(java.lang.String)",
+      "public bridge synthetic ai.vespa.languagemodels.completion.Prompt append(java.lang.String)",
+      "public bridge synthetic ai.vespa.languagemodels.completion.Prompt append(ai.vespa.languagemodels.completion.Completion)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.test.MockLanguageModel$Builder" : {
+  "ai.vespa.languagemodels.test.MockLanguageModel$Builder" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
     "attributes" : [
       "public"
     ],
     "methods" : [
-      "public ai.vespa.llm.test.MockLanguageModel$Builder completer(java.util.function.Function)",
+      "public ai.vespa.languagemodels.test.MockLanguageModel$Builder completer(java.util.function.Function)",
       "public void <init>()",
-      "public ai.vespa.llm.test.MockLanguageModel build()"
+      "public ai.vespa.languagemodels.test.MockLanguageModel build()"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.test.MockLanguageModel" : {
+  "ai.vespa.languagemodels.test.MockLanguageModel" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
-      "ai.vespa.llm.LanguageModel"
+      "ai.vespa.languagemodels.LanguageModel"
     ],
     "attributes" : [
       "public"
     ],
     "methods" : [
-      "public void <init>(ai.vespa.llm.test.MockLanguageModel$Builder)",
-      "public java.util.List complete(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters)",
-      "public java.util.concurrent.CompletableFuture completeAsync(ai.vespa.llm.completion.Prompt, ai.vespa.llm.InferenceParameters, java.util.function.Consumer)"
+      "public void <init>(ai.vespa.languagemodels.test.MockLanguageModel$Builder)",
+      "public java.util.List complete(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters)",
+      "public java.util.concurrent.CompletableFuture completeAsync(ai.vespa.languagemodels.completion.Prompt, ai.vespa.languagemodels.InferenceParameters, java.util.function.Consumer)"
     ],
     "fields" : [ ]
   }
diff --git a/vespajlib/src/main/java/ai/vespa/llm/InferenceParameters.java b/vespajlib/src/main/java/ai/vespa/languagemodels/InferenceParameters.java
index a942e5090e5..dd86db039dc 100755
--- a/vespajlib/src/main/java/ai/vespa/llm/InferenceParameters.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/InferenceParameters.java
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm;
+package ai.vespa.languagemodels;
 
 import com.yahoo.api.annotations.Beta;
 
diff --git a/vespajlib/src/main/java/ai/vespa/llm/LanguageModel.java b/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModel.java
index 059f25fadb4..115a6e21bd6 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/LanguageModel.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModel.java
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm;
+package ai.vespa.languagemodels;
 
-import ai.vespa.llm.completion.Completion;
-import ai.vespa.llm.completion.Prompt;
+import ai.vespa.languagemodels.completion.Completion;
+import ai.vespa.languagemodels.completion.Prompt;
 import com.yahoo.api.annotations.Beta;
 
 import java.util.List;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/LanguageModelException.java b/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModelException.java
index b5dbf615c08..f7ae7472d13 100755
--- a/vespajlib/src/main/java/ai/vespa/llm/LanguageModelException.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModelException.java
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm;
+package ai.vespa.languagemodels;
 
 import com.yahoo.api.annotations.Beta;
 
diff --git a/vespajlib/src/main/java/ai/vespa/llm/client/openai/OpenAiClient.java b/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/OpenAiClient.java
index 75308a84faa..c83fa4799c8 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/client/openai/OpenAiClient.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/OpenAiClient.java
@@ -1,11 +1,11 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.client.openai;
+package ai.vespa.languagemodels.client.openai;
 
-import ai.vespa.llm.LanguageModelException;
-import ai.vespa.llm.InferenceParameters;
-import ai.vespa.llm.completion.Completion;
-import ai.vespa.llm.LanguageModel;
-import ai.vespa.llm.completion.Prompt;
+import ai.vespa.languagemodels.LanguageModelException;
+import ai.vespa.languagemodels.InferenceParameters;
+import ai.vespa.languagemodels.completion.Completion;
+import ai.vespa.languagemodels.LanguageModel;
+import ai.vespa.languagemodels.completion.Prompt;
 import com.yahoo.api.annotations.Beta;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Inspector;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/client/openai/package-info.java b/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/package-info.java
index 2593d919499..d3f6d9042d8 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/client/openai/package-info.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/package-info.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
-package ai.vespa.llm.client.openai;
+package ai.vespa.languagemodels.client.openai;
 
 import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/completion/Completion.java b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Completion.java
index 91d0ad9bd02..68b6dc47bfd 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/completion/Completion.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Completion.java
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.completion;
+package ai.vespa.languagemodels.completion;
 
 import com.yahoo.api.annotations.Beta;
 
diff --git a/vespajlib/src/main/java/ai/vespa/llm/completion/Prompt.java b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Prompt.java
index 44dfb8499a8..f10a1768b8c 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/completion/Prompt.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Prompt.java
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.completion;
+package ai.vespa.languagemodels.completion;
 
 import com.yahoo.api.annotations.Beta;
 
diff --git a/vespajlib/src/main/java/ai/vespa/llm/completion/StringPrompt.java b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/StringPrompt.java
index 9e702c79a7a..d4bb387cd6c 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/completion/StringPrompt.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/StringPrompt.java
@@ -1,5 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.completion;
+package ai.vespa.languagemodels.completion;
 
 import com.yahoo.api.annotations.Beta;
 
diff --git a/vespajlib/src/main/java/ai/vespa/llm/completion/package-info.java b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/package-info.java
index 57c2b3f3364..fbae8d3a0e9 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/completion/package-info.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/completion/package-info.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
-package ai.vespa.llm.completion;
+package ai.vespa.languagemodels.completion;
 
 import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/package-info.java b/vespajlib/src/main/java/ai/vespa/languagemodels/package-info.java
index 8640f652ad4..9ec6a7773e5 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/package-info.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/package-info.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
-package ai.vespa.llm;
+package ai.vespa.languagemodels;
 
 import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/test/MockLanguageModel.java b/vespajlib/src/main/java/ai/vespa/languagemodels/test/MockLanguageModel.java
index 0e757a1f1e7..42bfb8b3e93 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/test/MockLanguageModel.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/test/MockLanguageModel.java
@@ -1,10 +1,10 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.test;
+package ai.vespa.languagemodels.test;
 
-import ai.vespa.llm.LanguageModel;
-import ai.vespa.llm.InferenceParameters;
-import ai.vespa.llm.completion.Completion;
-import ai.vespa.llm.completion.Prompt;
+import ai.vespa.languagemodels.LanguageModel;
+import ai.vespa.languagemodels.InferenceParameters;
+import ai.vespa.languagemodels.completion.Completion;
+import ai.vespa.languagemodels.completion.Prompt;
 import com.yahoo.api.annotations.Beta;
 
 import java.util.List;
diff --git a/vespajlib/src/main/java/ai/vespa/llm/test/package-info.java b/vespajlib/src/main/java/ai/vespa/languagemodels/test/package-info.java
index ab3b7acc657..ba5cf265408 100644
--- a/vespajlib/src/main/java/ai/vespa/llm/test/package-info.java
+++ b/vespajlib/src/main/java/ai/vespa/languagemodels/test/package-info.java
@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
-package ai.vespa.llm.test;
+package ai.vespa.languagemodels.test;
 
 /**
  * Tools for writing tests when working with large language models.
diff --git a/vespajlib/src/test/java/ai/vespa/llm/client/openai/OpenAiClientCompletionTest.java b/vespajlib/src/test/java/ai/vespa/languagemodels/client/openai/OpenAiClientCompletionTest.java
index 1baab26f496..d6cb4b13f50 100644
--- a/vespajlib/src/test/java/ai/vespa/llm/client/openai/OpenAiClientCompletionTest.java
+++ b/vespajlib/src/test/java/ai/vespa/languagemodels/client/openai/OpenAiClientCompletionTest.java
@@ -1,9 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.client.openai;
+package ai.vespa.languagemodels.client.openai;
 
-import ai.vespa.llm.InferenceParameters;
-import ai.vespa.llm.completion.Completion;
-import ai.vespa.llm.completion.StringPrompt;
+import ai.vespa.languagemodels.InferenceParameters;
+import ai.vespa.languagemodels.completion.StringPrompt;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
diff --git a/vespajlib/src/test/java/ai/vespa/llm/completion/CompletionTest.java b/vespajlib/src/test/java/ai/vespa/languagemodels/completion/CompletionTest.java
index 24c496a3d2c..304334a0ea2 100644
--- a/vespajlib/src/test/java/ai/vespa/llm/completion/CompletionTest.java
+++ b/vespajlib/src/test/java/ai/vespa/languagemodels/completion/CompletionTest.java
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package ai.vespa.llm.completion;
+package ai.vespa.languagemodels.completion;
 
-import ai.vespa.llm.InferenceParameters;
-import ai.vespa.llm.test.MockLanguageModel;
+import ai.vespa.languagemodels.test.MockLanguageModel;
+import ai.vespa.languagemodels.InferenceParameters;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;