Moved ai.vespa.llm.search to ai.vespa.search.llm

8 files changed, 23 insertions, 23 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
index ce73bc4f09e..baa9c4b9a48 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java
@@ -146,8 +146,8 @@ public class PlatformBundles {
             com.yahoo.search.searchers.RateLimitingSearcher.class.getName(),
             com.yahoo.vespa.streamingvisitors.MetricsSearcher.class.getName(),
             com.yahoo.vespa.streamingvisitors.StreamingBackend.class.getName(),
-            ai.vespa.llm.search.LLMSearcher.class.getName(),
-            ai.vespa.llm.search.RAGSearcher.class.getName(),
+            ai.vespa.search.llm.LLMSearcher.class.getName(),
+            ai.vespa.search.llm.RAGSearcher.class.getName(),
             ai.vespa.llm.clients.OpenAI.class.getName()
     );
 
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index b4c5cc1451e..e74fe22c588 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -9242,14 +9242,14 @@
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.search.LLMSearcher" : {
+  "ai.vespa.search.llm.LLMSearcher" : {
     "superClass" : "com.yahoo.search.Searcher",
     "interfaces" : [ ],
     "attributes" : [
       "public"
     ],
     "methods" : [
-      "public void <init>(ai.vespa.llm.search.LlmSearcherConfig, com.yahoo.component.provider.ComponentRegistry)",
+      "public void <init>(ai.vespa.search.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.llm.completion.Prompt)",
       "public java.lang.String getPrompt(com.yahoo.search.Query)",
@@ -9261,7 +9261,7 @@
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.search.LlmSearcherConfig$Builder" : {
+  "ai.vespa.search.llm.LlmSearcherConfig$Builder" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
       "com.yahoo.config.ConfigInstance$Builder"
@@ -9272,21 +9272,21 @@
     ],
     "methods" : [
       "public void <init>()",
-      "public void <init>(ai.vespa.llm.search.LlmSearcherConfig)",
-      "public ai.vespa.llm.search.LlmSearcherConfig$Builder propertyPrefix(java.lang.String)",
-      "public ai.vespa.llm.search.LlmSearcherConfig$Builder stream(boolean)",
-      "public ai.vespa.llm.search.LlmSearcherConfig$Builder providerId(java.lang.String)",
+      "public void <init>(ai.vespa.search.llm.LlmSearcherConfig)",
+      "public ai.vespa.search.llm.LlmSearcherConfig$Builder propertyPrefix(java.lang.String)",
+      "public ai.vespa.search.llm.LlmSearcherConfig$Builder stream(boolean)",
+      "public ai.vespa.search.llm.LlmSearcherConfig$Builder providerId(java.lang.String)",
       "public final boolean dispatchGetConfig(com.yahoo.config.ConfigInstance$Producer)",
       "public final java.lang.String getDefMd5()",
       "public final java.lang.String getDefName()",
       "public final java.lang.String getDefNamespace()",
       "public final boolean getApplyOnRestart()",
       "public final void setApplyOnRestart(boolean)",
-      "public ai.vespa.llm.search.LlmSearcherConfig build()"
+      "public ai.vespa.search.llm.LlmSearcherConfig build()"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.search.LlmSearcherConfig$Producer" : {
+  "ai.vespa.search.llm.LlmSearcherConfig$Producer" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
       "com.yahoo.config.ConfigInstance$Producer"
@@ -9297,11 +9297,11 @@
       "abstract"
     ],
     "methods" : [
-      "public abstract void getConfig(ai.vespa.llm.search.LlmSearcherConfig$Builder)"
+      "public abstract void getConfig(ai.vespa.search.llm.LlmSearcherConfig$Builder)"
     ],
     "fields" : [ ]
   },
-  "ai.vespa.llm.search.LlmSearcherConfig" : {
+  "ai.vespa.search.llm.LlmSearcherConfig" : {
     "superClass" : "com.yahoo.config.ConfigInstance",
     "interfaces" : [ ],
     "attributes" : [
@@ -9312,7 +9312,7 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public void <init>(ai.vespa.llm.search.LlmSearcherConfig$Builder)",
+      "public void <init>(ai.vespa.search.llm.LlmSearcherConfig$Builder)",
       "public java.lang.String propertyPrefix()",
       "public boolean stream()",
       "public java.lang.String providerId()"
@@ -9324,14 +9324,14 @@
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "ai.vespa.llm.search.RAGSearcher" : {
-    "superClass" : "ai.vespa.llm.search.LLMSearcher",
+  "ai.vespa.search.llm.RAGSearcher" : {
+    "superClass" : "ai.vespa.search.llm.LLMSearcher",
     "interfaces" : [ ],
     "attributes" : [
       "public"
     ],
     "methods" : [
-      "public void <init>(ai.vespa.llm.search.LlmSearcherConfig, com.yahoo.component.provider.ComponentRegistry)",
+      "public void <init>(ai.vespa.search.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.llm.completion.Prompt buildPrompt(com.yahoo.search.Query, com.yahoo.search.Result)"
     ],
diff --git a/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java b/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.java
index efa82f94c8f..860fc69af91 100755
--- a/container-search/src/main/java/ai/vespa/llm/search/LLMSearcher.java
+++ b/container-search/src/main/java/ai/vespa/search/llm/LLMSearcher.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.search;
+package ai.vespa.search.llm;
 
 import ai.vespa.llm.InferenceParameters;
 import ai.vespa.llm.LanguageModel;
diff --git a/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.java b/container-search/src/main/java/ai/vespa/search/llm/RAGSearcher.java
index 9d377ec527f..cba153d881d 100755
--- a/container-search/src/main/java/ai/vespa/llm/search/RAGSearcher.java
+++ b/container-search/src/main/java/ai/vespa/search/llm/RAGSearcher.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.search;
+package ai.vespa.search.llm;
 
 import ai.vespa.llm.LanguageModel;
 import ai.vespa.llm.completion.Prompt;
diff --git a/container-search/src/main/java/ai/vespa/llm/search/package-info.java b/container-search/src/main/java/ai/vespa/search/llm/package-info.java
index 6a8975fd2fa..60af24c47b2 100644
--- a/container-search/src/main/java/ai/vespa/llm/search/package-info.java
+++ b/container-search/src/main/java/ai/vespa/search/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.llm.search;
+package ai.vespa.search.llm;
 
 import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/container-search/src/main/resources/configdefinitions/llm-searcher.def b/container-search/src/main/resources/configdefinitions/llm-searcher.def
index 98301e46b56..608f44f04d0 100755
--- a/container-search/src/main/resources/configdefinitions/llm-searcher.def
+++ b/container-search/src/main/resources/configdefinitions/llm-searcher.def
@@ -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.search
+package=ai.vespa.search.llm
 
 # Query propertry prefix for options
 propertyPrefix string default="llm"
diff --git a/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java b/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.java
index 1c7d9db7708..11311ad9d9d 100755
--- a/container-search/src/test/java/ai/vespa/llm/search/LLMSearcherTest.java
+++ b/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.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.search;
+package ai.vespa.search.llm;
 
 import ai.vespa.llm.InferenceParameters;
 import ai.vespa.llm.LanguageModel;
diff --git a/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java b/container-search/src/test/java/ai/vespa/search/llm/RAGSearcherTest.java
index bd782371b20..d6b66b1a8c6 100755
--- a/container-search/src/test/java/ai/vespa/llm/search/RAGSearcherTest.java
+++ b/container-search/src/test/java/ai/vespa/search/llm/RAGSearcherTest.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.search;
+package ai.vespa.search.llm;
 
 import ai.vespa.llm.LanguageModel;
 import com.yahoo.component.ComponentId;