From: Xuan-Son Nguyen <redacted>
Date: Wed, 30 Apr 2025 20:29:15 +0000 (+0200)
Subject: arg : -hf do not fail if url mismatch (#13219)
X-Git-Tag: upstream/0.0.5318~82
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=6f67cf1f480926391ad75ff746e0a021214bf70c;p=pkg%2Fggml%2Fsources%2Fllama.cpp

arg : -hf do not fail if url mismatch (#13219)

* arg : -hf do not fail if url mismatch

* do not return if cannot parse metadata json
---

diff --git a/common/arg.cpp b/common/arg.cpp
index b8c72ee6..9f724167 100644
--- a/common/arg.cpp
+++ b/common/arg.cpp
@@ -287,13 +287,6 @@ static bool common_download_file_single(const std::string & url, const std::stri
             try {
                 metadata_in >> metadata;
                 LOG_DBG("%s: previous metadata file found %s: %s\n", __func__, metadata_path.c_str(), metadata.dump().c_str());
-                if (metadata.contains("url") && metadata.at("url").is_string()) {
-                    auto previous_url = metadata.at("url").get<std::string>();
-                    if (previous_url != url) {
-                        LOG_ERR("%s: Model URL mismatch: %s != %s\n", __func__, url.c_str(), previous_url.c_str());
-                        return false;
-                    }
-                }
                 if (metadata.contains("etag") && metadata.at("etag").is_string()) {
                     etag = metadata.at("etag");
                 }
@@ -301,10 +294,10 @@ static bool common_download_file_single(const std::string & url, const std::stri
                     last_modified = metadata.at("lastModified");
                 }
             } catch (const nlohmann::json::exception & e) {
-            LOG_ERR("%s: error reading metadata file %s: %s\n", __func__, metadata_path.c_str(), e.what());
-                return false;
+                LOG_ERR("%s: error reading metadata file %s: %s\n", __func__, metadata_path.c_str(), e.what());
             }
         }
+        // if we cannot open the metadata file, we assume that the downloaded file is not valid (etag and last-modified are left empty, so we will download it again)
     } else {
         LOG_INF("%s: no previous model file found %s\n", __func__, path.c_str());
     }