Merge pull request #31011 from vespa-engine/marius/update-significance-model-fields

Update significance model field and logic from architect meeting

5 files changed, 10 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java
index c210c2621a6..693eebd75a8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/SignificanceModelRegistry.java
@@ -33,17 +33,15 @@ public class SignificanceModelRegistry extends SimpleComponent implements Signif
         if (spec != null) {
 
             for (Element modelElement : XML.getChildren(spec, "model")) {
-                addConfig(
-                        modelElement.getAttribute("language"),
-                        Model.fromXml(deployState, modelElement, Set.of(SIGNIFICANCE_MODEL)).modelReference());
+                addConfig(Model.fromXml(deployState, modelElement, Set.of(SIGNIFICANCE_MODEL)).modelReference());
             }
         }
     }
 
 
-    public void addConfig(String language, ModelReference path) {
+    public void addConfig(ModelReference path) {
         configList.add(
-                new SignificanceModelConfig(language, path)
+                new SignificanceModelConfig(path)
         );
     }
 
@@ -53,19 +51,16 @@ public class SignificanceModelRegistry extends SimpleComponent implements Signif
         builder.model(
                 configList.stream()
                 .map(config -> new SignificanceConfig.Model.Builder()
-                        .language(config.language)
                         .path(config.path)
                 ).toList()
         );
     }
 
 
-    class SignificanceModelConfig {
-        private final String language;
+    static class SignificanceModelConfig {
         private final ModelReference path;
 
-        public SignificanceModelConfig(String language, ModelReference path) {
-            this.language = language;
+        public SignificanceModelConfig(ModelReference path) {
             this.path = path;
         }
 
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 08092f10020..c79a7b38d09 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -138,7 +138,7 @@ Threadpool = element threadpool {
 }
 
 Significance = element significance {
-    element model { attribute language { xsd:string } & ModelReference }*
+    element model { ModelReference }*
 }
 
 Clients = element clients {
diff --git a/config-model/src/test/cfg/significance/services.xml b/config-model/src/test/cfg/significance/services.xml
index 6991f5498fb..ffdb73bfc2e 100644
--- a/config-model/src/test/cfg/significance/services.xml
+++ b/config-model/src/test/cfg/significance/services.xml
@@ -8,9 +8,9 @@
   <container version="1.0">
     <search>
         <significance>
-            <model language="en" model-id="idf-wiki-english" path="models/idf-english-wiki.json.zst"/>
-            <model language="no" path="models/idf-norwegian-wiki.json.zst" />
-            <model language="ru" url="https://some/uri/blob.json" />
+            <model model-id="idf-wiki-english" path="models/idf-english-wiki.json.zst"/>
+            <model path="models/idf-norwegian-wiki.json.zst" />
+            <model url="https://some/uri/blob.json" />
         </significance>
     </search>
   </container>
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
index 00e95a34287..26e8c67a226 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/significance/test/SignificanceModelTestCase.java
@@ -37,9 +37,6 @@ public class SignificanceModelTestCase {
         ApplicationContainerCluster containerCluster = vespaModel.getContainerClusters().get("container");
         var significanceConfig = assertSignificancePresent(containerCluster);
         assertEquals(3, significanceConfig.model().size());
-        assertEquals("en", significanceConfig.model().get(0).language());
-        assertEquals("no", significanceConfig.model().get(1).language());
-        assertEquals("ru", significanceConfig.model().get(2).language());
 
         assertEquals("models/idf-norwegian-wiki.json.zst", modelReference(significanceConfig.model().get(1), "path").path().orElseThrow().value());
         assertEquals("https://some/uri/blob.json", modelReference(significanceConfig.model().get(2), "path").url().orElseThrow().value());
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 7333ef5a87b..a413ec7753b 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -168,7 +168,7 @@
       </threadpool>
 
       <significance>
-        <model language="en" model-id="idf-wiki-simple-english" path="models/idf-simple-english-wiki.json.zst" />
+        <model model-id="idf-wiki-simple-english" path="models/idf-simple-english-wiki.json.zst" />
       </significance>
     </search>