Disregard ONNX model type info if file not found

2 files changed, 11 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java
index 8e92b1980ac..5c37b345edf 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelTypeResolver.java
@@ -32,6 +32,11 @@ public class OnnxModelTypeResolver extends Processor {
         for (OnnxModel onnxModel : search.onnxModels().asMap().values()) {
             OnnxModelInfo onnxModelInfo = OnnxModelInfo.load(onnxModel.getFileName(), search.applicationPackage());
 
+            // Temporary, to disregard type information when model info is not available
+            if (onnxModelInfo == null) {
+                continue;
+            }
+
             // Add any missing input and output fields that were not specified in the onnx-model configuration
             for (String onnxName : onnxModelInfo.getInputs()) {
                 onnxModel.addInputNameMapping(onnxName, OnnxModelInfo.asValidIdentifier(onnxName), false);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
index 7526a8a8595..0a838e5d915 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/OnnxModelInfo.java
@@ -125,7 +125,12 @@ public class OnnxModelInfo {
         if (app.getFile(generatedModelInfoPath(pathInApplicationPackage)).exists()) {
             return loadFromGeneratedInfo(pathInApplicationPackage, app);
         }
-        throw new IllegalArgumentException("Unable to find ONNX model file or generated ONNX info file");
+
+        // Temporary:
+        return null;
+
+        // This is the correct behaviour after we've gotten applications through.
+        // throw new IllegalArgumentException("Unable to find ONNX model file or generated ONNX info file");
     }
 
     static public boolean modelExists(String path, ApplicationPackage app) {