Revert "Revert "Try to add back method removed from API but still in use""revert-28660-revert-28656-hmusum/fix-onnx-model-cost

2 files changed, 2 insertions, 1 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
index 595cd97e6b6..9507f7db7b6 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/OnnxModelCost.java
@@ -12,6 +12,7 @@ import com.yahoo.config.application.api.DeployLogger;
  */
 public interface OnnxModelCost {
 
+    default Calculator newCalculator(DeployLogger logger) { return newCalculator(null, logger); }
     Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger);
 
     interface Calculator {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java b/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java
index 9794cfe4ad7..fddf8409376 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/DefaultOnnxModelCost.java
@@ -56,7 +56,7 @@ public class DefaultOnnxModelCost implements OnnxModelCost {
             String path = f.getPath().getRelative();
             if (alreadyAnalyzed(path)) return;
             log.log(Level.FINE, () -> "Register model '%s'".formatted(path));
-            if (f.exists()) {
+            if (f.exists() && appPkg != null) {
                 var memoryStats = OnnxModelProbe.probeMemoryStats(appPkg, f.getPath()).orElse(null);
                 if (memoryStats != null) {
                     log.log(Level.FINE, () -> "Register model '%s' with memory stats: %s".formatted(path, memoryStats));