test passed

Author: tastelikefeet

common/arg.cpp

@@ -374,6 +374,8 @@ static bool common_download_file_single(const std::string & url, const std::stri
 
         //  display download progress
         curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 0L);
+        curl_easy_setopt(curl.get(), CURLOPT_USERAGENT, "llama.cpp/1.0");
+
 
         // helper function to hide password in URL
         auto llama_download_hide_password_in_url = [](const std::string & url) -> std::string {
@@ -544,7 +546,15 @@ static struct common_hf_file_res common_get_hf_file(const std::string & hf_repo_
     curl_ptr       curl(curl_easy_init(), &curl_easy_cleanup);
     curl_slist_ptr http_headers;
     std::string res_str;
-    std::string url = "https://huggingface.co/v2/" + hf_repo + "/manifests/" + tag;
+
+    std::string hf_endpoint = "https://huggingface.co/";
+    const char * hf_endpoint_env = getenv("HF_ENDPOINT");
+    if (hf_endpoint_env) {
+        hf_endpoint = hf_endpoint_env;
+        if (hf_endpoint.back() != '/') hf_endpoint += '/';
+    }
+
+    std::string url = hf_endpoint + "v2/" + hf_repo + "/manifests/" + tag;
     curl_easy_setopt(curl.get(), CURLOPT_URL, url.c_str());
     curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 1L);
     typedef size_t(*CURLOPT_WRITEFUNCTION_PTR)(void * ptr, size_t size, size_t nmemb, void * data);

examples/run/run.cpp

@@ -697,8 +697,15 @@ class LlamaData {
         std::vector<std::string> headers = { "User-Agent: llama-cpp", "Accept: application/json" };
         std::string              url;
 
+        std::string hf_endpoint = "https://huggingface.co/";
+        const char * hf_endpoint_env = getenv("HF_ENDPOINT");
+        if (hf_endpoint_env) {
+            hf_endpoint = hf_endpoint_env;
+            if (hf_endpoint.back() != '/') hf_endpoint += '/';
+        }
+
         if (pos == std::string::npos) {
-            auto [model_name, manifest_url] = extract_model_and_tag(model, "https://huggingface.co/v2/");
+            auto [model_name, manifest_url] = extract_model_and_tag(model, hf_endpoint + "v2/");
             hfr                             = model_name;
 
             nlohmann::json manifest;
@@ -713,59 +720,8 @@ class LlamaData {
             hff = model.substr(pos + 1);
         }
 
-        url = "https://huggingface.co/" + hfr + "/resolve/main/" + hff;
-
-        return download(url, bn, true, headers);
-    }
-
-    int modelscope_dl(std::string & model, const std::string & bn) {
-        //Download from ModelScope model repository, quant is optional and case-insensitive.
-        //default to the input tag or Q4_K_M, will fall back to first GGUF file in the repo if quant is not specified and tag is not found.
-        size_t pos = model.find('/');
-        pos        = model.find('/', pos + 1);
-        std::string              msr;
-        std::string              msf;
-        std::vector<std::string> headers = { "User-Agent: llama-cpp", "Accept: application/json"};
-        std::string              url;
-        auto endpoint = MODELSCOPE_DOMAIN_DEFINITION;
-
-        if (pos == std::string::npos) {
-            auto [model_name, tag] = extract_model_and_tag(model, "");
-            msr                             = model_name;
-            rm_until_substring(tag, "/manifests/");
-            std::transform(tag.begin(), tag.end(), std::begin(tag), ::tolower);
-            if (tag == "latest" || tag.empty()) {
-                //ModelScope does not support latest tag
-                tag = "q4_k_m";
-            }
-            std::string manifest_str;
-            url = endpoint + "/api/v1/models/" + msr + "/repo/files?Revision=master&Recursive=True";
-            if (int ret = download(url, "", false, headers, &manifest_str)) {
-                return ret;
-            }
-            auto all_files = nlohmann::json::parse(manifest_str)["Data"]["Files"];
-
-            std::vector<std::string> all_available_files;
-            for (const auto & _file : all_files) {
-                auto file = _file["Path"].get<std::string>();
-                std::transform(file.begin(), file.end(), std::begin(file), ::tolower);
-                if (!string_ends_with(file, ".gguf")) {
-                    continue;
-                }
-                if (file.find(tag) != std::string::npos) {
-                    msf = file;
-                }
-                all_available_files.push_back(file);
-            }
-            if (msf.empty()) {
-                msf = all_available_files[0];
-            }
+        url = hf_endpoint + hfr + "/resolve/main/" + hff;
 
-        } else {
-            msr = model.substr(0, pos);
-            msf = model.substr(pos + 1);
-        }
-        url = endpoint + "/models/" + msr + "/resolve/master/" + msf;
         return download(url, bn, true, headers);
     }
 
@@ -886,12 +842,6 @@ class LlamaData {
             rm_until_substring(model_, "hf.co/");
             rm_until_substring(model_, "://");
             ret = huggingface_dl(model_, bn);
-        } else if (string_starts_with(model_, "ms://") || string_starts_with(model_, "modelscope://") ||
-            model_.find("modelscope") != std::string::npos || LLAMACPP_USE_MODELSCOPE_DEFINITION) {
-            rm_until_substring(model_, "modelscope.cn/");
-            rm_until_substring(model_, "modelscope.ai/");
-            rm_until_substring(model_, "://");
-            ret = modelscope_dl(model_, bn);
         } else if ((string_starts_with(model_, "https://") || string_starts_with(model_, "http://")) &&
                    !string_starts_with(model_, "https://ollama.com/library/")) {
             ret = download(model_, bn, true);
@@ -1299,4 +1249,4 @@ int main(int argc, const char ** argv) {
     }
 
     return 0;
-}
+}