From 27ca694a7eaade5ebb50ffdbaa29983bb740f274 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Tue, 7 Jan 2020 13:04:34 +0100
Subject: More error information

---
 .../com/yahoo/vespa/model/ml/ConvertedModel.java   | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
index 55979023119..1263b9bed6e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
@@ -118,21 +118,33 @@ public class ConvertedModel {
                                             RankProfile rankProfile,
                                             QueryProfileRegistry queryProfileRegistry,
                                             ImportedMlModel importedModel) {
-        ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName);
-        return new ConvertedModel(modelName,
-                                  modelDescription,
-                                  convertAndStore(importedModel, rankProfile, queryProfileRegistry, modelStore),
-                                  Optional.of(importedModel));
+        try {
+            ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName);
+            return new ConvertedModel(modelName,
+                                      modelDescription,
+                                      convertAndStore(importedModel, rankProfile, queryProfileRegistry, modelStore),
+                                      Optional.of(importedModel));
+        }
+        catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("In " + rankProfile + ": Could not create model '" + modelName +
+                                               " (" + modelDescription + ")", e);
+        }
     }
 
     public static ConvertedModel fromStore(ModelName modelName,
                                            String modelDescription,
                                            RankProfile rankProfile) {
-        ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName);
-        return new ConvertedModel(modelName,
-                                  modelDescription,
-                                  convertStored(modelStore, rankProfile),
-                                  Optional.empty());
+        try {
+            ModelStore modelStore = new ModelStore(rankProfile.applicationPackage(), modelName);
+            return new ConvertedModel(modelName,
+                                      modelDescription,
+                                      convertStored(modelStore, rankProfile),
+                                      Optional.empty());
+        }
+        catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("In " + rankProfile + ": Could not create model '" + modelName +
+                                               " (" + modelDescription + ")", e);
+        }
     }
 
     /**
-- 
cgit v1.2.3