diff options
25 files changed, 104 insertions, 104 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index b33509d5bd8..1aba05e8113 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -9152,7 +9152,7 @@ "ai.vespa.llm.clients.ConfigurableLanguageModel" : { "superClass" : "java.lang.Object", "interfaces" : [ - "ai.vespa.languagemodels.LanguageModel" + "ai.vespa.llm.LanguageModel" ], "attributes" : [ "public", @@ -9161,10 +9161,10 @@ "methods" : [ "public void <init>()", "public void <init>(ai.vespa.llm.LlmClientConfig, com.yahoo.container.jdisc.secretstore.SecretStore)", - "protected java.lang.String getApiKey(ai.vespa.languagemodels.InferenceParameters)", - "protected void setApiKey(ai.vespa.languagemodels.InferenceParameters)", + "protected java.lang.String getApiKey(ai.vespa.llm.InferenceParameters)", + "protected void setApiKey(ai.vespa.llm.InferenceParameters)", "protected java.lang.String getEndpoint()", - "protected void setEndpoint(ai.vespa.languagemodels.InferenceParameters)" + "protected void setEndpoint(ai.vespa.llm.InferenceParameters)" ], "fields" : [ ] }, @@ -9176,8 +9176,8 @@ ], "methods" : [ "public void <init>(ai.vespa.llm.LlmClientConfig, com.yahoo.container.jdisc.secretstore.SecretStore)", - "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)" + "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)" ], "fields" : [ ] }, @@ -9190,7 +9190,7 @@ "methods" : [ "public void <init>(ai.vespa.llm.LlmSearcherConfig, com.yahoo.component.provider.ComponentRegistry)", "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)", - "protected com.yahoo.search.Result complete(com.yahoo.search.Query, ai.vespa.languagemodels.completion.Prompt)", + "protected com.yahoo.search.Result complete(com.yahoo.search.Query, ai.vespa.llm.completion.Prompt)", "public java.lang.String getPrompt(com.yahoo.search.Query)", "public java.lang.String getPropertyPrefix()", "public java.lang.String lookupProperty(java.lang.String, com.yahoo.search.Query)", @@ -9209,7 +9209,7 @@ "methods" : [ "public void <init>(ai.vespa.llm.LlmSearcherConfig, com.yahoo.component.provider.ComponentRegistry)", "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)", - "protected ai.vespa.languagemodels.completion.Prompt buildPrompt(com.yahoo.search.Query, com.yahoo.search.Result)" + "protected ai.vespa.llm.completion.Prompt buildPrompt(com.yahoo.search.Query, com.yahoo.search.Result)" ], "fields" : [ ] } 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 f3bb29552d6..2f1991aa789 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 @@ -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.clients; -import ai.vespa.languagemodels.InferenceParameters; -import ai.vespa.languagemodels.LanguageModel; +import ai.vespa.llm.InferenceParameters; +import ai.vespa.llm.LanguageModel; import ai.vespa.llm.LlmClientConfig; import com.yahoo.api.annotations.Beta; import com.yahoo.component.annotation.Inject; diff --git a/container-search/src/main/java/ai/vespa/llm/clients/OpenAI.java b/container-search/src/main/java/ai/vespa/llm/clients/OpenAI.java index bc99aa51097..f6092f51948 100644 --- a/container-search/src/main/java/ai/vespa/llm/clients/OpenAI.java +++ b/container-search/src/main/java/ai/vespa/llm/clients/OpenAI.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.clients; -import ai.vespa.languagemodels.InferenceParameters; +import ai.vespa.llm.InferenceParameters; import ai.vespa.llm.LlmClientConfig; -import ai.vespa.languagemodels.client.openai.OpenAiClient; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; +import ai.vespa.llm.client.openai.OpenAiClient; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; import com.yahoo.api.annotations.Beta; import com.yahoo.component.annotation.Inject; import com.yahoo.container.jdisc.secretstore.SecretStore; diff --git a/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java b/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java index 040393083b8..9a316de1893 100755 --- a/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java +++ b/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java @@ -1,13 +1,13 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.llm.search; -import ai.vespa.languagemodels.InferenceParameters; -import ai.vespa.languagemodels.LanguageModel; -import ai.vespa.languagemodels.LanguageModelException; +import ai.vespa.llm.InferenceParameters; +import ai.vespa.llm.LanguageModel; +import ai.vespa.llm.LanguageModelException; import ai.vespa.llm.LlmSearcherConfig; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; -import ai.vespa.languagemodels.completion.StringPrompt; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; +import ai.vespa.llm.completion.StringPrompt; import com.yahoo.api.annotations.Beta; import com.yahoo.component.ComponentId; import com.yahoo.component.annotation.Inject; diff --git a/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.java b/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.java index ac3cdb04749..b8e33778ced 100755 --- a/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.java +++ b/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.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.search; -import ai.vespa.languagemodels.LanguageModel; +import ai.vespa.llm.LanguageModel; import ai.vespa.llm.LlmSearcherConfig; -import ai.vespa.languagemodels.completion.Prompt; -import ai.vespa.languagemodels.completion.StringPrompt; +import ai.vespa.llm.completion.Prompt; +import ai.vespa.llm.completion.StringPrompt; import com.yahoo.api.annotations.Beta; import com.yahoo.component.annotation.Inject; import com.yahoo.component.provider.ComponentRegistry; 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 ed786a0f372..1f2a12322a1 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 @@ -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.clients; -import ai.vespa.languagemodels.InferenceParameters; +import ai.vespa.llm.InferenceParameters; import ai.vespa.llm.LlmClientConfig; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; -import ai.vespa.languagemodels.completion.StringPrompt; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; +import ai.vespa.llm.completion.StringPrompt; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.container.jdisc.SecretStoreProvider; import com.yahoo.container.jdisc.secretstore.SecretStore; diff --git a/container-search/src/test/java/ai/vespa/llm/clients/MockLLMClient.java b/container-search/src/test/java/ai/vespa/llm/clients/MockLLMClient.java index 45a36bd1b6f..cfb6a43984f 100644 --- a/container-search/src/test/java/ai/vespa/llm/clients/MockLLMClient.java +++ b/container-search/src/test/java/ai/vespa/llm/clients/MockLLMClient.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.clients; -import ai.vespa.languagemodels.InferenceParameters; +import ai.vespa.llm.InferenceParameters; import ai.vespa.llm.LlmClientConfig; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; import com.yahoo.container.jdisc.secretstore.SecretStore; import java.util.List; diff --git a/container-search/src/test/java/ai/vespa/llm/clients/OpenAITest.java b/container-search/src/test/java/ai/vespa/llm/clients/OpenAITest.java index 363833cd0c1..1111a9824f5 100644 --- a/container-search/src/test/java/ai/vespa/llm/clients/OpenAITest.java +++ b/container-search/src/test/java/ai/vespa/llm/clients/OpenAITest.java @@ -1,9 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.llm.clients; -import ai.vespa.languagemodels.InferenceParameters; +import ai.vespa.llm.InferenceParameters; import ai.vespa.llm.LlmClientConfig; -import ai.vespa.languagemodels.completion.StringPrompt; +import ai.vespa.llm.completion.StringPrompt; import com.yahoo.container.jdisc.SecretStoreProvider; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; 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 0b4d334e4be..91fd0db3c12 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 @@ -1,13 +1,13 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.llm.search; -import ai.vespa.languagemodels.InferenceParameters; -import ai.vespa.languagemodels.LanguageModel; +import ai.vespa.llm.InferenceParameters; +import ai.vespa.llm.LanguageModel; import ai.vespa.llm.LlmClientConfig; import ai.vespa.llm.LlmSearcherConfig; import ai.vespa.llm.clients.ConfigurableLanguageModelTest; import ai.vespa.llm.clients.MockLLMClient; -import ai.vespa.languagemodels.completion.Prompt; +import ai.vespa.llm.completion.Prompt; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.component.provider.ComponentRegistry; diff --git a/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java b/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java index 41d999794cb..ccf9a4a6401 100755 --- a/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java +++ b/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.llm.search; -import ai.vespa.languagemodels.LanguageModel; +import ai.vespa.llm.LanguageModel; import ai.vespa.llm.LlmSearcherConfig; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json index c92d41edfd9..45e88ac2e94 100644 --- a/vespajlib/abi-spec.json +++ b/vespajlib/abi-spec.json @@ -4077,7 +4077,7 @@ ], "fields" : [ ] }, - "ai.vespa.languagemodels.InferenceParameters" : { + "ai.vespa.llm.InferenceParameters" : { "superClass" : "java.lang.Object", "interfaces" : [ ], "attributes" : [ @@ -4097,7 +4097,7 @@ ], "fields" : [ ] }, - "ai.vespa.languagemodels.LanguageModel" : { + "ai.vespa.llm.LanguageModel" : { "superClass" : "java.lang.Object", "interfaces" : [ ], "attributes" : [ @@ -4106,12 +4106,12 @@ "abstract" ], "methods" : [ - "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)" + "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)" ], "fields" : [ ] }, - "ai.vespa.languagemodels.LanguageModelException" : { + "ai.vespa.llm.LanguageModelException" : { "superClass" : "java.lang.RuntimeException", "interfaces" : [ ], "attributes" : [ @@ -4123,22 +4123,22 @@ ], "fields" : [ ] }, - "ai.vespa.languagemodels.client.openai.OpenAiClient" : { + "ai.vespa.llm.client.openai.OpenAiClient" : { "superClass" : "java.lang.Object", "interfaces" : [ - "ai.vespa.languagemodels.LanguageModel" + "ai.vespa.llm.LanguageModel" ], "attributes" : [ "public" ], "methods" : [ "public void <init>()", - "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)" + "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)" ], "fields" : [ ] }, - "ai.vespa.languagemodels.completion.Completion$FinishReason" : { + "ai.vespa.llm.completion.Completion$FinishReason" : { "superClass" : "java.lang.Enum", "interfaces" : [ ], "attributes" : [ @@ -4147,17 +4147,17 @@ "enum" ], "methods" : [ - "public static ai.vespa.languagemodels.completion.Completion$FinishReason[] values()", - "public static ai.vespa.languagemodels.completion.Completion$FinishReason valueOf(java.lang.String)" + "public static ai.vespa.llm.completion.Completion$FinishReason[] values()", + "public static ai.vespa.llm.completion.Completion$FinishReason valueOf(java.lang.String)" ], "fields" : [ - "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" + "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" ] }, - "ai.vespa.languagemodels.completion.Completion" : { + "ai.vespa.llm.completion.Completion" : { "superClass" : "java.lang.Record", "interfaces" : [ ], "attributes" : [ @@ -4166,18 +4166,18 @@ "record" ], "methods" : [ - "public void <init>(java.lang.String, ai.vespa.languagemodels.completion.Completion$FinishReason)", + "public void <init>(java.lang.String, ai.vespa.llm.completion.Completion$FinishReason)", "public java.lang.String text()", - "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 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 final java.lang.String toString()", "public final int hashCode()", "public final boolean equals(java.lang.Object)" ], "fields" : [ ] }, - "ai.vespa.languagemodels.completion.Prompt" : { + "ai.vespa.llm.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.languagemodels.completion.Prompt append(ai.vespa.languagemodels.completion.Completion)", - "public abstract ai.vespa.languagemodels.completion.Prompt append(java.lang.String)" + "public ai.vespa.llm.completion.Prompt append(ai.vespa.llm.completion.Completion)", + "public abstract ai.vespa.llm.completion.Prompt append(java.lang.String)" ], "fields" : [ ] }, - "ai.vespa.languagemodels.completion.StringPrompt" : { - "superClass" : "ai.vespa.languagemodels.completion.Prompt", + "ai.vespa.llm.completion.StringPrompt" : { + "superClass" : "ai.vespa.llm.completion.Prompt", "interfaces" : [ ], "attributes" : [ "public" ], "methods" : [ "public java.lang.String asString()", - "public ai.vespa.languagemodels.completion.StringPrompt append(java.lang.String)", - "public ai.vespa.languagemodels.completion.StringPrompt append(ai.vespa.languagemodels.completion.Completion)", + "public ai.vespa.llm.completion.StringPrompt append(java.lang.String)", + "public ai.vespa.llm.completion.StringPrompt append(ai.vespa.llm.completion.Completion)", "public java.lang.String toString()", - "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)" + "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)" ], "fields" : [ ] }, - "ai.vespa.languagemodels.test.MockLanguageModel$Builder" : { + "ai.vespa.llm.test.MockLanguageModel$Builder" : { "superClass" : "java.lang.Object", "interfaces" : [ ], "attributes" : [ "public" ], "methods" : [ - "public ai.vespa.languagemodels.test.MockLanguageModel$Builder completer(java.util.function.Function)", + "public ai.vespa.llm.test.MockLanguageModel$Builder completer(java.util.function.Function)", "public void <init>()", - "public ai.vespa.languagemodels.test.MockLanguageModel build()" + "public ai.vespa.llm.test.MockLanguageModel build()" ], "fields" : [ ] }, - "ai.vespa.languagemodels.test.MockLanguageModel" : { + "ai.vespa.llm.test.MockLanguageModel" : { "superClass" : "java.lang.Object", "interfaces" : [ - "ai.vespa.languagemodels.LanguageModel" + "ai.vespa.llm.LanguageModel" ], "attributes" : [ "public" ], "methods" : [ - "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)" + "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)" ], "fields" : [ ] } diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/InferenceParameters.java b/vespajlib/src/main/java/ai/vespa/llm/InferenceParameters.java index dd86db039dc..a942e5090e5 100755 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/InferenceParameters.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels; +package ai.vespa.llm; import com.yahoo.api.annotations.Beta; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModel.java b/vespajlib/src/main/java/ai/vespa/llm/LanguageModel.java index 115a6e21bd6..059f25fadb4 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModel.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels; +package ai.vespa.llm; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; import com.yahoo.api.annotations.Beta; import java.util.List; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModelException.java b/vespajlib/src/main/java/ai/vespa/llm/LanguageModelException.java index f7ae7472d13..b5dbf615c08 100755 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/LanguageModelException.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels; +package ai.vespa.llm; import com.yahoo.api.annotations.Beta; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/OpenAiClient.java b/vespajlib/src/main/java/ai/vespa/llm/client/openai/OpenAiClient.java index c83fa4799c8..75308a84faa 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/OpenAiClient.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.client.openai; +package ai.vespa.llm.client.openai; -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 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 com.yahoo.api.annotations.Beta; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Inspector; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/package-info.java b/vespajlib/src/main/java/ai/vespa/llm/client/openai/package-info.java index d3f6d9042d8..2593d919499 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/client/openai/package-info.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.client.openai; +package ai.vespa.llm.client.openai; import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Completion.java b/vespajlib/src/main/java/ai/vespa/llm/completion/Completion.java index 68b6dc47bfd..91d0ad9bd02 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Completion.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.completion; +package ai.vespa.llm.completion; import com.yahoo.api.annotations.Beta; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Prompt.java b/vespajlib/src/main/java/ai/vespa/llm/completion/Prompt.java index f10a1768b8c..44dfb8499a8 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/Prompt.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.completion; +package ai.vespa.llm.completion; import com.yahoo.api.annotations.Beta; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/StringPrompt.java b/vespajlib/src/main/java/ai/vespa/llm/completion/StringPrompt.java index d4bb387cd6c..9e702c79a7a 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/StringPrompt.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.completion; +package ai.vespa.llm.completion; import com.yahoo.api.annotations.Beta; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/package-info.java b/vespajlib/src/main/java/ai/vespa/llm/completion/package-info.java index fbae8d3a0e9..57c2b3f3364 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/completion/package-info.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.completion; +package ai.vespa.llm.completion; import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/package-info.java b/vespajlib/src/main/java/ai/vespa/llm/package-info.java index 9ec6a7773e5..8640f652ad4 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/package-info.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels; +package ai.vespa.llm; import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/test/MockLanguageModel.java b/vespajlib/src/main/java/ai/vespa/llm/test/MockLanguageModel.java index 42bfb8b3e93..0e757a1f1e7 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/test/MockLanguageModel.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.test; +package ai.vespa.llm.test; -import ai.vespa.languagemodels.LanguageModel; -import ai.vespa.languagemodels.InferenceParameters; -import ai.vespa.languagemodels.completion.Completion; -import ai.vespa.languagemodels.completion.Prompt; +import ai.vespa.llm.LanguageModel; +import ai.vespa.llm.InferenceParameters; +import ai.vespa.llm.completion.Completion; +import ai.vespa.llm.completion.Prompt; import com.yahoo.api.annotations.Beta; import java.util.List; diff --git a/vespajlib/src/main/java/ai/vespa/languagemodels/test/package-info.java b/vespajlib/src/main/java/ai/vespa/llm/test/package-info.java index ba5cf265408..ab3b7acc657 100644 --- a/vespajlib/src/main/java/ai/vespa/languagemodels/test/package-info.java +++ b/vespajlib/src/main/java/ai/vespa/llm/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.languagemodels.test; +package ai.vespa.llm.test; /** * Tools for writing tests when working with large language models. diff --git a/vespajlib/src/test/java/ai/vespa/languagemodels/client/openai/OpenAiClientCompletionTest.java b/vespajlib/src/test/java/ai/vespa/llm/client/openai/OpenAiClientCompletionTest.java index d6cb4b13f50..4dd02f01d05 100644 --- a/vespajlib/src/test/java/ai/vespa/languagemodels/client/openai/OpenAiClientCompletionTest.java +++ b/vespajlib/src/test/java/ai/vespa/llm/client/openai/OpenAiClientCompletionTest.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.languagemodels.client.openai; +package ai.vespa.llm.client.openai; -import ai.vespa.languagemodels.InferenceParameters; -import ai.vespa.languagemodels.completion.StringPrompt; +import ai.vespa.llm.InferenceParameters; +import ai.vespa.llm.completion.StringPrompt; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/vespajlib/src/test/java/ai/vespa/languagemodels/completion/CompletionTest.java b/vespajlib/src/test/java/ai/vespa/llm/completion/CompletionTest.java index 304334a0ea2..d31a5129156 100644 --- a/vespajlib/src/test/java/ai/vespa/languagemodels/completion/CompletionTest.java +++ b/vespajlib/src/test/java/ai/vespa/llm/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.languagemodels.completion; +package ai.vespa.llm.completion; -import ai.vespa.languagemodels.test.MockLanguageModel; -import ai.vespa.languagemodels.InferenceParameters; +import ai.vespa.llm.test.MockLanguageModel; +import ai.vespa.llm.InferenceParameters; import org.junit.jupiter.api.Test; import java.util.List; |