1 files changed, 19 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
index 5f1cd16c68e..eb9f7d44c91 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.derived;
 
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
@@ -54,6 +54,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
 
     private final String name;
     private final Compressor.Compression compressedProperties;
+    private final Map<String, RankProfile.RankFeatureNormalizer> featureNormalizers;
 
     /**  The compiled profile this is created from. */
     private final Collection<RankProfile.Constant> constants;
@@ -66,13 +67,14 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
         this.name = rankProfile.name();
         /*
          * Forget the RankProfiles as soon as possible. They can become very large and memory hungry
-         * Especially do not refer then through any member variables due to the RawRankProfile living forever.
+         * Especially do not refer them through any member variables due to the RawRankProfile living forever.
          */
         RankProfile compiled = rankProfile.compile(queryProfiles, importedModels);
         constants = compiled.constants().values();
         onnxModels = compiled.onnxModels().values();
-        compressedProperties = compress(new Deriver(compiled, attributeFields, deployProperties, queryProfiles)
-                                                .derive(largeExpressions));
+        var deriver = new Deriver(compiled, attributeFields, deployProperties, queryProfiles);
+        compressedProperties = compress(deriver.derive(largeExpressions));
+        this.featureNormalizers = compiled.getFeatureNormalizers();
     }
 
     public Collection<RankProfile.Constant> constants() { return constants; }
@@ -111,6 +113,18 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
         b.fef(fefB);
     }
 
+    private void buildNormalizers(RankProfilesConfig.Rankprofile.Builder b) {
+        for (var normalizer : featureNormalizers.values()) {
+            var nBuilder = new RankProfilesConfig.Rankprofile.Normalizer.Builder();
+            nBuilder.name(normalizer.name());
+            nBuilder.input(normalizer.input());
+            var algo = RankProfilesConfig.Rankprofile.Normalizer.Algo.Enum.valueOf(normalizer.algo());
+            nBuilder.algo(algo);
+            nBuilder.kparam(normalizer.kparam());
+            b.normalizer(nBuilder);
+        }
+     }
+
     /**
      * Returns the properties of this as an unmodifiable list.
      * Note: This method is expensive.
@@ -121,6 +135,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
     public void getConfig(RankProfilesConfig.Builder builder) {
         RankProfilesConfig.Rankprofile.Builder b = new RankProfilesConfig.Rankprofile.Builder().name(getName());
         getRankProperties(b);
+        buildNormalizers(b);
         builder.rankprofile(b);
     }