1 files changed, 5 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/ConversionContext.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/ConversionContext.java
index bef766e7ef9..70f6e405a92 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/types/ConversionContext.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/ConversionContext.java
@@ -15,6 +15,7 @@ public class ConversionContext {
     private final String destination;
     private final CompiledQueryProfileRegistry registry;
     private final Map<String, Embedder> embedders;
+    private final Map<String, String> contextValues;
     private final Language language;
 
     public ConversionContext(String destination, CompiledQueryProfileRegistry registry, Embedder embedder,
@@ -30,6 +31,7 @@ public class ConversionContext {
         this.embedders = embedders;
         this.language = context.containsKey("language") ? Language.fromLanguageTag(context.get("language"))
                                                         : Language.UNKNOWN;
+        this.contextValues = context;
     }
 
     /** Returns the local name of the field which will receive the converted value (or null when this is empty) */
@@ -44,6 +46,9 @@ public class ConversionContext {
     /** Returns the language, which is never null but may be UNKNOWN */
     Language language() { return language; }
 
+    /** Returns a read-only map of context key-values which can be looked up during conversion. */
+    Map<String,String> contextValues() { return contextValues; }
+
     /** Returns an empty context */
     public static ConversionContext empty() {
         return new ConversionContext(null, null, Embedder.throwsOnUse.asMap(), Map.of());