Propagate full message

4 files changed, 7 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 74d92bcfd02..3cd2499f968 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -41,6 +41,7 @@ import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.container.search.QueryProfilesBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRuleBuilder;
 import com.yahoo.vespa.model.container.search.SemanticRules;
+import com.yahoo.yolean.Exceptions;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -217,7 +218,7 @@ public class DeployState implements ConfigDefinitionStore {
         for (var entry : importedModels.getSkippedModels().entrySet()) {
             // TODO: Vespa 8: Throw IllegalArgumentException instead
             deployLogger.logApplicationPackage(Level.WARNING, "Skipping import of model " + entry.getKey() + " as an exception " +
-                                                              "occurred during import. Error: " + entry.getValue());
+                                                              "occurred during import: " + entry.getValue());
         }
         return importedModels;
     }
diff --git a/config-model/src/test/cfg/application/stateless_eval/example.model b/config-model/src/test/cfg/application/stateless_eval/example.model
index af1c85be4f0..1d2db15c3ba 100644
--- a/config-model/src/test/cfg/application/stateless_eval/example.model
+++ b/config-model/src/test/cfg/application/stateless_eval/example.model
@@ -7,6 +7,7 @@ model example {
     constants {
         constant1: tensor(x[3]):{{x:0}:0.5, {x:1}:1.5, {x:2}:2.5}
         constant2: 3.0
+        #constant1asLarge tensor(x[3]): file:constant1asLarge.json
     }
 
     constant constant1asLarge {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTest.java
index f246b87d9bf..bec72f78a65 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ml/ModelsEvaluatorTest.java
@@ -18,8 +18,7 @@ import static org.junit.Assume.assumeTrue;
 public class ModelsEvaluatorTest {
 
     @Test
-    public void testModelsEvaluatorTester() {
-        assumeTrue(OnnxEvaluator.isRuntimeAvailable());
+    public void testModelsEvaluator() {
         ModelsEvaluator modelsEvaluator = ModelsEvaluatorTester.create("src/test/cfg/application/stateless_eval");
         assertEquals(3, modelsEvaluator.models().size());
 
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModels.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModels.java
index 367b840a728..1003ebd8f3f 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModels.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/configmodelview/ImportedMlModels.java
@@ -3,6 +3,7 @@ package ai.vespa.rankingexpression.importer.configmodelview;
 
 import com.yahoo.concurrent.InThreadExecutorService;
 import com.yahoo.path.Path;
+import com.yahoo.yolean.Exceptions;
 
 import java.io.File;
 import java.util.Arrays;
@@ -55,7 +56,7 @@ public class ImportedMlModels {
                     models.put(name, model);
                 }
             } catch (InterruptedException | ExecutionException e) {
-                skippedModels.put(name, e.getMessage());
+                skippedModels.put(name, Exceptions.toMessageString(e));
             }
         });
         importedModels = Collections.unmodifiableMap(models);
@@ -97,7 +98,7 @@ public class ImportedMlModels {
                 if (existing != null) {
                     try {
                         throw new IllegalArgumentException("The models in " + child + " and " + existing.get().source() +
-                                " both resolve to the model name '" + name + "'");
+                                                           " both resolve to the model name '" + name + "'");
                     } catch (InterruptedException | ExecutionException e) {}
                 }