Merge branch 'master' into lesters/add-local-llms

1 files changed, 13 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Model.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Model.java
index 7d6285d00c1..3a8e52c92a8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Model.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Model.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.model.container.xml.ModelIdResolver;
 import org.w3c.dom.Element;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -51,11 +52,22 @@ class Model {
 
     static Model fromXml(DeployState ds, Element model, Set<String> requiredTags) {
         var modelId = XmlHelper.getOptionalAttribute(model, "model-id").orElse(null);
-        var url = XmlHelper.getOptionalAttribute(model, "url").map(URI::create).orElse(null);
+        var url = XmlHelper.getOptionalAttribute(model, "url").map(Model::parseUrl).orElse(null);
         var path = XmlHelper.getOptionalAttribute(model, "path").map(Path::fromString).orElse(null);
         return new Model(ds, model.getTagName(), modelId, url, path, requiredTags);
     }
 
+    private static URI parseUrl(String url) {
+        try {
+            var uri = new URI(url);
+            if ( ! uri.isAbsolute())
+                throw new IllegalArgumentException("Invalid url '" + url + "': url has no 'scheme' component");
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid url '" + url + "':" + e.getMessage());
+        }
+    }
+
     /** Return tokenizer model from XML if specified, alternatively use model id for ONNX model with suffix '-vocab' appended */
     static Model fromXmlOrImplicitlyFromOnnxModel(
             DeployState ds, Element parent, Model onnxModel, String paramName, Set<String> requiredTags) {