Split out HTTP(S) (ureq) and image default-formats into features

Author: glasgow-haskell-omelette

Cargo.toml

@@ -16,8 +16,8 @@ anyhow = { version = "1" }
 slsl = { version = "0.0.7", features = ["rayon"], optional = true }
 aksr = { version = "0.0.7" }
 ab_glyph = { version = "0.2.32" }
-image = { version = "0.25" }
-imageproc = { version = "0.25" }
+image = { version = "0.25", default-features = false, features = ["rayon"] }
+imageproc = { version = "0.25", default-features = false, features = ["rayon"] }
 ndarray = { version = "0.16.1", features = ["rayon"] }
 half = { version = "2.7.1", features = ["bytemuck", "num-traits"] }
 indicatif = { version = "0.18" }
@@ -26,7 +26,7 @@ prost = { version = "0.14.1" }
 paste = { version = "1.0.15" }
 rand = { version = "0.9" }
 http = { version = "1.3" }
-ureq = { version = "3" }
+ureq = { version = "3", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 rayon = { version = "1.10.0" }
@@ -66,11 +66,12 @@ debug = false
 
 
 [features]
-default = ["ort-download-binaries", "yolo"]
+default = ["ort-download-binaries", "yolo", "http", "image-default-formats"]
 
 # Utility features
 video = ["dep:video-rs"]
 viewer = ["dep:minifb"]
+image-default-formats = ["image/default-formats"]
 
 # ONNX Runtime features
 ort-download-binaries = ["ort", "ort/download-binaries"]
@@ -102,6 +103,8 @@ tokenizers = ["dep:tokenizers"]
 
 # Hugging Face hub support (for downloading models from Hugging Face)
 hf-hub = ["dep:hf-hub"]
+# HTTP(S) request support (for downloading models from other sources)
+http = ["dep:ureq"]
 
 # SLSL tensor library (used by yolo and clip)
 slsl = ["dep:slsl"]

src/core/hub.rs

@@ -67,7 +67,7 @@ pub struct Hub {
     /// GitHub repository owner
     owner: String,
 
-    /// GitHub repository name          
+    /// GitHub repository name
     repo: String,
 
     /// Directory to store the downloaded file
@@ -151,6 +151,10 @@ impl Hub {
         anyhow::bail!("HF hub support is not enabled. Please enable the 'hf-hub' feature.")
     }
 
+    pub fn try_fetch(&mut self, s: &str) -> Result<String> {
+        unimplemented!("'http' feature not enabled, ureq compiled out")
+    }
+
     /// Attempts to fetch a file from a local path, GitHub release, or Hugging Face repository.
     ///
     /// The `try_fetch` method supports multiple scenarios:
@@ -199,6 +203,7 @@ impl Hub {
     /// let temp_hf_path = Hub::default().try_fetch("BAAI/bge-m3/sentencepiece.bpe.model")
     ///     .expect("Failed to fetch HF file");
     /// ```
+    #[cfg(feature = "http")]
     pub fn try_fetch(&mut self, s: &str) -> Result<String> {
         #[derive(Default, Debug, aksr::Builder)]
         struct Pack {
@@ -405,7 +410,13 @@ impl Hub {
             .with_context(|| format!("Failed to convert PathBuf: {:?} to String", saveout))
     }
 
+    #[cfg(not(feature = "http"))]
+    fn fetch_and_cache_releases(&self, url: &str, cache_path: &Path) -> Result<String> {
+        unimplemented!("'http' feature not enabled, ureq compiled out")
+    }
+
     /// Fetch releases from GitHub and cache them
+    #[cfg(feature = "http")]
     fn fetch_and_cache_releases(&self, url: &str, cache_path: &Path) -> Result<String> {
         let response = retry!(self.max_attempts, self.fetch_get_response(url))?;
         let body = response
@@ -479,7 +490,18 @@ impl Hub {
         Ok(y)
     }
 
+    #[cfg(not(feature = "http"))]
+    pub fn download<P: AsRef<Path> + std::fmt::Debug>(
+        &self,
+        src: &str,
+        dst: P,
+        message: Option<&str>,
+    ) -> Result<()> {
+        unimplemented!("'http' feature disabled, ureq compiled out")
+    }
+
     /// Download a file from a github release to a specified path with a progress bar
+    #[cfg(feature = "http")]
     pub fn download<P: AsRef<Path> + std::fmt::Debug>(
         &self,
         src: &str,
@@ -558,6 +580,7 @@ impl Hub {
         Ok(())
     }
 
+    #[cfg(feature = "http")]
     fn fetch_get_response(&self, url: &str) -> anyhow::Result<http::Response<ureq::Body>> {
         let config = ureq::Agent::config_builder()
             .proxy(ureq::Proxy::try_from_env())