refactor: only blocking validation (#611)

## Closes

- Closes #538 as OBE
- Closes #517 

## Related to

- Once Stranger6667/jsonschema#385 lands we
can re-add async validation

Author: gadomski

Cargo.toml

@@ -54,7 +54,7 @@ geo-types = "0.7.13"
 geoarrow = "0.4.0-beta.3"
 geojson = "0.24.1"
 http = "1.1"
-jsonschema = { version = "0.22.3", default-features = false }
+jsonschema = { version = "0.28.3", default-features = false }
 libduckdb-sys = "1.1.1"
 log = "0.4.22"
 mime = "0.3.17"

crates/core/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Removed
+
+- Async validation ([#611](https://github.com/stac-utils/stac-rs/pull/611))
+
 ## [0.11.1] - 2025-01-02
 
 ### Added

crates/core/Cargo.toml

@@ -43,8 +43,7 @@ object-store-all = [
     "object-store-http",
 ]
 reqwest = ["dep:reqwest"]
-validate = ["dep:jsonschema", "dep:reqwest", "dep:tokio", "dep:fluent-uri"]
-validate-blocking = ["validate", "tokio/rt"]
+validate = ["dep:jsonschema", "dep:fluent-uri", "reqwest"]
 
 [dependencies]
 arrow-array = { workspace = true, optional = true }
@@ -58,7 +57,7 @@ geo = { workspace = true, optional = true }
 geo-types = { workspace = true, optional = true }
 geoarrow = { workspace = true, optional = true }
 geojson.workspace = true
-jsonschema = { workspace = true, optional = true }
+jsonschema = { workspace = true, optional = true, features = ["resolve-http"] }
 log.workspace = true
 mime.workspace = true
 object_store = { workspace = true, optional = true }
@@ -82,11 +81,11 @@ tokio-test.workspace = true
 
 [[test]]
 name = "examples"
-required-features = ["validate-blocking"]
+required-features = ["validate"]
 
 [[test]]
 name = "migrate"
-required-features = ["validate-blocking"]
+required-features = ["validate"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -101,5 +100,4 @@ denylist = [
     "object-store-azure",
     "object-store-gcp",
     "object-store-http",
-    "validate-blocking",
 ]

crates/core/src/error.rs

@@ -21,7 +21,7 @@ pub enum Error {
     /// [fluent_uri::error::ParseError]
     #[error(transparent)]
     #[cfg(feature = "validate")]
-    FluentUriParse(#[from] fluent_uri::error::ParseError),
+    FluentUriParse(#[from] fluent_uri::error::ParseError<String>),
 
     /// Returned when unable to read a STAC value from a path.
     #[error("{io}: {path}")]
@@ -102,7 +102,7 @@ pub enum Error {
     Parquet(#[from] parquet::errors::ParquetError),
 
     /// [reqwest::Error]
-    #[cfg(any(feature = "reqwest", feature = "validate"))]
+    #[cfg(any(feature = "reqwest"))]
     #[error(transparent)]
     Reqwest(#[from] reqwest::Error),
 
@@ -116,7 +116,7 @@ pub enum Error {
 
     /// [tokio::task::JoinError]
     #[error(transparent)]
-    #[cfg(any(feature = "validate", feature = "object-store"))]
+    #[cfg(feature = "object-store")]
     TokioJoin(#[from] tokio::task::JoinError),
 
     /// [std::num::TryFromIntError]

crates/core/src/lib.rs

@@ -209,8 +209,6 @@ pub use node::{Container, Node};
 #[cfg(feature = "object-store")]
 pub use resolver::Resolver;
 pub use statistics::Statistics;
-#[cfg(feature = "validate-blocking")]
-pub use validate::ValidateBlocking;
 #[cfg(feature = "validate")]
 pub use validate::{Validate, Validator};
 pub use value::Value;
@@ -332,6 +330,11 @@ pub fn version() -> &'static str {
     env!("CARGO_PKG_VERSION")
 }
 
+/// Returns a string suitable for use as a HTTP user agent.
+pub fn user_agent() -> &'static str {
+    concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"))
+}
+
 #[cfg(test)]
 mod tests {
     use rstest as _;

crates/core/src/validate/blocking.rs

@@ -7,19 +7,7 @@
 //! ```
 //! use stac::{Item, Validate};
 //!
-//! # tokio_test::block_on(async {
-//! Item::new("an-id").validate().await.unwrap();
-//! # })
-//! ```
-//!
-//! If you're working in a blocking context (not async), enable the `blocking` feature and use [ValidateBlocking]:
-//!
-//! ```
-//! #[cfg(feature = "blocking")]
-//! {
-//!     use stac::{ValidateBlocking, Item};
-//!     Item::new("an-id").validate_blocking().unwrap();
-//! }
+//! Item::new("an-id").validate().unwrap();
 //! ```
 //!
 //! All fetched schemas are cached, so if you're you're doing multiple
@@ -28,27 +16,20 @@
 //! ```
 //! # use stac::{Item, Validator};
 //! let mut items: Vec<_> = (0..10).map(|n| Item::new(format!("item-{}", n))).collect();
-//! # tokio_test::block_on(async {
-//! let mut validator = Validator::new().await.unwrap();
+//! let mut validator = Validator::new().unwrap();
 //! for item in items {
-//!     validator.validate(&item).await.unwrap();
+//!     validator.validate(&item).unwrap();
 //! }
-//! # })
 //! ```
 //!
 //! [Validator] is cheap to clone, so you are encouraged to validate a large
 //! number of objects at the same time if that's your use-case.
 
 use crate::Result;
 use serde::Serialize;
-use std::future::Future;
 
-#[cfg(feature = "validate-blocking")]
-mod blocking;
 mod validator;
 
-#[cfg(feature = "validate-blocking")]
-pub use blocking::ValidateBlocking;
 pub use validator::Validator;
 
 /// Validate any serializable object with [json-schema](https://json-schema.org/)
@@ -68,15 +49,11 @@ pub trait Validate: Serialize + Sized {
     /// use stac::{Item, Validate};
     ///
     /// let mut item = Item::new("an-id");
-    /// # tokio_test::block_on(async {
-    /// item.validate().await.unwrap();
-    /// });
+    /// item.validate().unwrap();
     /// ```
-    fn validate(&self) -> impl Future<Output = Result<()>> {
-        async {
-            let validator = Validator::new().await?;
-            validator.validate(self).await
-        }
+    fn validate(&self) -> Result<()> {
+        let mut validator = Validator::new()?;
+        validator.validate(self)
     }
 }