Upgrade 'ureq' to 2.1 (from 1.5)

Author: nbigaouette

onnxruntime-sys/Cargo.toml

@@ -18,7 +18,7 @@ keywords = ["neuralnetworks", "onnx", "bindings"]
 
 [build-dependencies]
 bindgen = { version = "0.55", optional = true }
-ureq = "1.5.1"
+ureq = "2.1"
 
 # Used on Windows
 zip = "0.5"

onnxruntime-sys/build.rs

@@ -122,13 +122,9 @@ where
     P: AsRef<Path>,
 {
     let resp = ureq::get(source_url)
-        .timeout_connect(1_000) // 1 second
         .timeout(std::time::Duration::from_secs(300))
-        .call();
-
-    if resp.error() {
-        panic!("ERROR: Failed to download {}: {:#?}", source_url, resp);
-    }
+        .call()
+        .unwrap_or_else(|err| panic!("ERROR: Failed to download {}: {:?}", source_url, err));
 
     let len = resp
         .header("Content-Length")

onnxruntime/Cargo.toml

@@ -27,13 +27,13 @@ thiserror = "1.0"
 tracing = "0.1"
 
 # Enabled with 'model-fetching' feature
-ureq = { version = "1.5.1", optional = true }
+ureq = { version = "2.1", optional = true }
 
 [dev-dependencies]
 image = "0.23"
 test-env-log = { version = "0.2", default-features = false, features = ["trace"] }
 tracing-subscriber = "0.2"
-ureq = "1.5.1"
+ureq = "2.1"
 
 [features]
 # Fetch model from ONNX Model Zoo (https://github.com/onnx/models)

onnxruntime/src/download.rs

@@ -79,9 +79,9 @@ impl AvailableOnnxModel {
             );
 
             let resp = ureq::get(url)
-                .timeout_connect(1_000) // 1 second
                 .timeout(Duration::from_secs(180)) // 3 minutes
-                .call();
+                .call()
+                .map_err(OrtDownloadError::UreqError)?;
 
             assert!(resp.has("Content-Length"));
             let len = resp

onnxruntime/src/error.rs

@@ -140,6 +140,10 @@ pub enum OrtDownloadError {
     /// Generic input/output error
     #[error("Error downloading data to file: {0}")]
     IoError(#[from] io::Error),
+    #[cfg(feature = "model-fetching")]
+    /// Download error by ureq
+    #[error("Error downloading data to file: {0}")]
+    UreqError(#[from] ureq::Error),
     /// Error getting content-length from an HTTP GET request
     #[error("Error getting content-length")]
     ContentLengthError,

onnxruntime/tests/integration_tests.rs

@@ -5,6 +5,8 @@ use std::{
     time::Duration,
 };
 
+use onnxruntime::error::OrtDownloadError;
+
 mod download {
     use super::*;
 
@@ -294,16 +296,15 @@ mod download {
     }
 }
 
-fn get_imagenet_labels() -> Result<Vec<String>, io::Error> {
+fn get_imagenet_labels() -> Result<Vec<String>, OrtDownloadError> {
     // Download the ImageNet class labels, matching SqueezeNet's classes.
     let labels_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("synset.txt");
     if !labels_path.exists() {
         let url = "https://s3.amazonaws.com/onnx-model-zoo/synset.txt";
         println!("Downloading {:?} to {:?}...", url, labels_path);
         let resp = ureq::get(url)
-            .timeout_connect(1_000) // 1 second
             .timeout(Duration::from_secs(180)) // 3 minutes
-            .call();
+            .call()?;
 
         assert!(resp.has("Content-Length"));
         let len = resp
@@ -323,5 +324,7 @@ fn get_imagenet_labels() -> Result<Vec<String>, io::Error> {
     }
     let file = BufReader::new(fs::File::open(labels_path).unwrap());
 
-    file.lines().collect()
+    file.lines()
+        .map(|line| line.map_err(|io_err| OrtDownloadError::IoError(io_err)))
+        .collect()
 }