convert from reqwest blocking to non-blocking to conform to wasm target (#71)

* convert from reqwest blocking to non-blocking to conform to wasm target

* bump core to 4.1.1

* handle and update_result

* bump dependencies to 4.1.1

Author: leoromanovsky

eppo_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eppo_core"
-version = "4.1.0"
+version = "4.1.1"
 edition = "2021"
 description = "Eppo SDK core library"
 repository = "https://github.com/Eppo-exp/rust-sdk"
@@ -26,11 +26,12 @@ log = { version = "0.4.21", features = ["kv", "kv_serde"] }
 md5 = "0.7.0"
 rand = "0.8.5"
 regex = "1.10.4"
-reqwest = { version = "0.12.4", features = ["blocking", "json"] }
+reqwest = { version = "0.12.4", features = ["json"] }
 semver = { version = "1.0.22", features = ["serde"] }
 serde = { version = "1.0.198", features = ["derive", "rc"] }
 serde_json = "1.0.116"
 thiserror = "1.0.60"
+tokio = { version = "1.34.0", features = ["rt", "time"] }
 url = "2.5.0"
 
 # pyo3 dependencies

eppo_core/src/configuration_fetcher.rs

@@ -20,7 +20,7 @@ const BANDIT_ENDPOINT: &'static str = "/flag-config/v1/bandits";
 /// A client that fetches Eppo configuration from the server.
 pub struct ConfigurationFetcher {
     // Client holds a connection pool internally, so we're reusing the client between requests.
-    client: reqwest::blocking::Client,
+    client: reqwest::Client,
     config: ConfigurationFetcherConfig,
     /// If we receive a 401 Unauthorized error during a request, it means the API key is not
     /// valid. We cache this error so we don't issue additional requests to the server.
@@ -29,7 +29,7 @@ pub struct ConfigurationFetcher {
 
 impl ConfigurationFetcher {
     pub fn new(config: ConfigurationFetcherConfig) -> ConfigurationFetcher {
-        let client = reqwest::blocking::Client::new();
+        let client = reqwest::Client::new();
 
         ConfigurationFetcher {
             client,
@@ -38,24 +38,24 @@ impl ConfigurationFetcher {
         }
     }
 
-    pub fn fetch_configuration(&mut self) -> Result<Configuration> {
+    pub async fn fetch_configuration(&mut self) -> Result<Configuration> {
         if self.unauthorized {
             return Err(Error::Unauthorized);
         }
 
-        let ufc = self.fetch_ufc_configuration()?;
+        let ufc = self.fetch_ufc_configuration().await?;
 
         let bandits = if ufc.compiled.flag_to_bandit_associations.is_empty() {
             // We don't need bandits configuration if there are no bandits.
             None
         } else {
-            Some(self.fetch_bandits_configuration()?)
+            Some(self.fetch_bandits_configuration().await?)
         };
 
         Ok(Configuration::from_server_response(ufc, bandits))
     }
 
-    fn fetch_ufc_configuration(&mut self) -> Result<UniversalFlagConfig> {
+    async fn fetch_ufc_configuration(&mut self) -> Result<UniversalFlagConfig> {
         let url = Url::parse_with_params(
             &format!("{}{}", self.config.base_url, UFC_ENDPOINT),
             &[
@@ -68,7 +68,7 @@ impl ConfigurationFetcher {
         .map_err(|err| Error::InvalidBaseUrl(err))?;
 
         log::debug!(target: "eppo", "fetching UFC flags configuration");
-        let response = self.client.get(url).send()?;
+        let response = self.client.get(url).send().await?;
 
         let response = response.error_for_status().map_err(|err| {
             if err.status() == Some(StatusCode::UNAUTHORIZED) {
@@ -82,15 +82,17 @@ impl ConfigurationFetcher {
             }
         })?;
 
-        let configuration =
-            UniversalFlagConfig::from_json(self.config.sdk_metadata, response.bytes()?.into())?;
+        let configuration = UniversalFlagConfig::from_json(
+            self.config.sdk_metadata,
+            response.bytes().await?.into(),
+        )?;
 
         log::debug!(target: "eppo", "successfully fetched UFC flags configuration");
 
         Ok(configuration)
     }
 
-    fn fetch_bandits_configuration(&mut self) -> Result<BanditResponse> {
+    async fn fetch_bandits_configuration(&mut self) -> Result<BanditResponse> {
         let url = Url::parse_with_params(
             &format!("{}{}", self.config.base_url, BANDIT_ENDPOINT),
             &[
@@ -103,7 +105,7 @@ impl ConfigurationFetcher {
         .map_err(|err| Error::InvalidBaseUrl(err))?;
 
         log::debug!(target: "eppo", "fetching UFC bandits configuration");
-        let response = self.client.get(url).send()?;
+        let response = self.client.get(url).send().await?;
 
         let response = response.error_for_status().map_err(|err| {
             if err.status() == Some(StatusCode::UNAUTHORIZED) {
@@ -117,7 +119,7 @@ impl ConfigurationFetcher {
             }
         })?;
 
-        let configuration = response.json()?;
+        let configuration = response.json().await?;
 
         log::debug!(target: "eppo", "successfully fetched UFC bandits configuration");
 

eppo_core/src/poller_thread.rs

@@ -131,9 +131,19 @@ impl PollerThread {
             std::thread::Builder::new()
                 .name("eppo-poller".to_owned())
                 .spawn(move || {
+                    let runtime = match tokio::runtime::Builder::new_current_thread()
+                        .enable_all()
+                        .build()
+                    {
+                        Ok(runtime) => runtime,
+                        Err(err) => {
+                            update_result(Err(Error::from(err)));
+                            return;
+                        }
+                    };
                     loop {
                         log::debug!(target: "eppo", "fetching new configuration");
-                        let result = fetcher.fetch_configuration();
+                        let result = runtime.block_on(fetcher.fetch_configuration());
                         match result {
                             Ok(configuration) => {
                                 store.set_configuration(Arc::new(configuration));

python-sdk/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "eppo_py"
-version = "4.1.0"
+version = "4.1.1"
 edition = "2021"
 publish = false
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-eppo_core = { version = "4.1.0", path = "../eppo_core", features = ["pyo3", "vendored"] }
+eppo_core = { version = "4.1.1", path = "../eppo_core", features = ["pyo3", "vendored"] }
 log = "0.4.22"
 pyo3 = { version = "0.22.0" }
 pyo3-log = "0.11.0"

ruby-sdk/Cargo.lock

@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 env_logger = { version = "0.11.3", features = ["unstable-kv"] }
-eppo_core = { version = "4.1.0", features = ["vendored"] }
+eppo_core = { version = "4.1.1", features = ["vendored"] }
 log = { version = "0.4.21", features = ["kv_serde"] }
 magnus = { version = "0.6.4" }
 serde = { version = "1.0.203", features = ["derive"] }

ruby-sdk/ext/eppo_client/Cargo.toml

@@ -11,7 +11,7 @@ categories = ["config"]
 rust-version = "1.71.1"
 
 [dependencies]
-eppo_core = { version = "=4.1.0", path = "../eppo_core" }
+eppo_core = { version = "=4.1.1", path = "../eppo_core" }
 log = { version = "0.4.21", features = ["kv", "kv_serde"] }
 serde_json = "1.0.116"