Merge pull request #25214 from vespa-engine/arnej/empty-string-as-model-would-fail

trying to make an OnnxEvaluator with empty path would fail

1 files changed, 8 insertions, 0 deletions

diff --git a/model-integration/src/main/java/ai/vespa/modelintegration/evaluator/OnnxEvaluator.java b/model-integration/src/main/java/ai/vespa/modelintegration/evaluator/OnnxEvaluator.java
index bdcceddb04f..125707c9aaa 100644
--- a/model-integration/src/main/java/ai/vespa/modelintegration/evaluator/OnnxEvaluator.java
+++ b/model-integration/src/main/java/ai/vespa/modelintegration/evaluator/OnnxEvaluator.java
@@ -37,6 +37,9 @@ public class OnnxEvaluator {
             environment = OrtEnvironment.getEnvironment();
             session = environment.createSession(modelPath, options.getOptions());
         } catch (OrtException e) {
+            if (e.getCode() == OrtException.OrtErrorCode.ORT_NO_SUCHFILE) {
+                throw new IllegalArgumentException("No such file: "+modelPath);
+            }
             throw new RuntimeException("ONNX Runtime exception", e);
         }
     }
@@ -101,6 +104,11 @@ public class OnnxEvaluator {
         try {
             new OnnxEvaluator(modelPath);
             return true;
+        } catch (IllegalArgumentException e) {
+            if (e.getMessage().equals("No such file: ")) {
+                return true;
+            }
+            return false;
         } catch (UnsatisfiedLinkError | RuntimeException | NoClassDefFoundError e) {
             return false;
         }