feat: add into_http_result() util for better error message (#1235)

Author: georgeh0

src/llm/anthropic.rs

@@ -88,19 +88,13 @@ impl LlmGenerationClient for Client {
 
         let encoded_api_key = encode(&self.api_key);
 
-        let resp = retryable::run(
-            || async {
-                self.client
-                    .post(url)
-                    .header("x-api-key", encoded_api_key.as_ref())
-                    .header("anthropic-version", "2023-06-01")
-                    .json(&payload)
-                    .send()
-                    .await?
-                    .error_for_status()
-            },
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
+        let resp = http::request(|| {
+            self.client
+                .post(url)
+                .header("x-api-key", encoded_api_key.as_ref())
+                .header("anthropic-version", "2023-06-01")
+                .json(&payload)
+        })
         .await
         .context("Anthropic API error")?;
 

src/llm/bedrock.rs

@@ -106,22 +106,16 @@ impl LlmGenerationClient for Client {
 
         let encoded_api_key = encode(&self.api_key);
 
-        let resp = retryable::run(
-            || async {
-                self.client
-                    .post(&url)
-                    .header(
-                        "Authorization",
-                        format!("Bearer {}", encoded_api_key.as_ref()),
-                    )
-                    .header("Content-Type", "application/json")
-                    .json(&payload)
-                    .send()
-                    .await?
-                    .error_for_status()
-            },
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
+        let resp = http::request(|| {
+            self.client
+                .post(&url)
+                .header(
+                    "Authorization",
+                    format!("Bearer {}", encoded_api_key.as_ref()),
+                )
+                .header("Content-Type", "application/json")
+                .json(&payload)
+        })
         .await
         .context("Bedrock API error")?;
 

src/llm/gemini.rs

@@ -150,18 +150,9 @@ impl LlmGenerationClient for AiStudioClient {
         }
 
         let url = self.get_api_url(request.model, "generateContent");
-        let resp = retryable::run(
-            || self.client.post(&url).json(&payload).send(),
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
-        .await?;
-        if !resp.status().is_success() {
-            bail!(
-                "Gemini API error: {:?}\n{}\n",
-                resp.status(),
-                resp.text().await?
-            );
-        }
+        let resp = http::request(|| self.client.post(&url).json(&payload))
+            .await
+            .context("Gemini API error")?;
         let resp_json: Value = resp.json().await.context("Invalid JSON")?;
 
         if let Some(error) = resp_json.get("error") {

src/llm/ollama.rs

@@ -101,17 +101,11 @@ impl LlmGenerationClient for Client {
             system: request.system_prompt.as_ref().map(|s| s.as_ref()),
             stream: Some(false),
         };
-        let res = retryable::run(
-            || async {
-                self.reqwest_client
-                    .post(self.generate_url.as_str())
-                    .json(&req)
-                    .send()
-                    .await?
-                    .error_for_status()
-            },
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
+        let res = http::request(|| {
+            self.reqwest_client
+                .post(self.generate_url.as_str())
+                .json(&req)
+        })
         .await
         .context("Ollama API error")?;
         let json: OllamaResponse = res.json().await?;
@@ -140,19 +134,9 @@ impl LlmEmbeddingClient for Client {
             model: request.model,
             input: request.text.as_ref(),
         };
-        let resp = retryable::run(
-            || async {
-                self.reqwest_client
-                    .post(self.embed_url.as_str())
-                    .json(&req)
-                    .send()
-                    .await?
-                    .error_for_status()
-            },
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
-        .await
-        .context("Ollama API error")?;
+        let resp = http::request(|| self.reqwest_client.post(self.embed_url.as_str()).json(&req))
+            .await
+            .context("Ollama API error")?;
 
         let embedding_resp: OllamaEmbeddingResponse = resp.json().await.context("Invalid JSON")?;
 

src/llm/voyage.rs

@@ -75,18 +75,12 @@ impl LlmEmbeddingClient for Client {
             payload["input_type"] = serde_json::Value::String(task_type.into());
         }
 
-        let resp = retryable::run(
-            || async {
-                self.client
-                    .post(url)
-                    .header("Authorization", format!("Bearer {}", self.api_key))
-                    .json(&payload)
-                    .send()
-                    .await?
-                    .error_for_status()
-            },
-            &retryable::HEAVY_LOADED_OPTIONS,
-        )
+        let resp = http::request(|| {
+            self.client
+                .post(url)
+                .header("Authorization", format!("Bearer {}", self.api_key))
+                .json(&payload)
+        })
         .await
         .context("Voyage AI API error")?;
 

src/ops/targets/kuzu.rs

@@ -80,12 +80,9 @@ impl KuzuThinClient {
         let query = json!({
             "query": cyper_builder.query
         });
-        self.reqwest_client
-            .post(&self.query_url)
-            .json(&query)
-            .send()
-            .await?
-            .error_for_status()?;
+        http::request(|| self.reqwest_client.post(&self.query_url).json(&query))
+            .await
+            .context("Kuzu API error")?;
         Ok(())
     }
 }

src/prelude.rs

@@ -26,7 +26,7 @@ pub(crate) use crate::ops::interface;
 pub(crate) use crate::service::error::{ApiError, invariance_violation};
 pub(crate) use crate::setup;
 pub(crate) use crate::setup::AuthRegistry;
-pub(crate) use crate::utils::{self, batching, concur_control, retryable};
+pub(crate) use crate::utils::{self, batching, concur_control, http, retryable};
 pub(crate) use crate::{api_bail, api_error};
 
 pub(crate) use anyhow::{anyhow, bail};

src/utils/http.rs

@@ -0,0 +1,31 @@
+use crate::utils::retryable::{self, IsRetryable};
+
+pub async fn request(
+    req_builder: impl Fn() -> reqwest::RequestBuilder,
+) -> anyhow::Result<reqwest::Response> {
+    let resp = retryable::run(
+        || async {
+            let req = req_builder();
+            let resp = req.send().await?;
+            let Err(err) = resp.error_for_status_ref() else {
+                return Ok(resp);
+            };
+
+            let is_retryable = err.is_retryable();
+
+            let mut anyhow_error = anyhow::Error::new(err);
+            let body = resp.text().await?;
+            if !body.is_empty() {
+                anyhow_error = anyhow_error.context(format!("Error message body:\n{body}"));
+            }
+
+            Err(retryable::Error {
+                error: anyhow_error,
+                is_retryable,
+            })
+        },
+        &retryable::HEAVY_LOADED_OPTIONS,
+    )
+    .await?;
+    Ok(resp)
+}

src/utils/mod.rs

@@ -4,6 +4,7 @@ pub mod concur_control;
 pub mod db;
 pub mod deser;
 pub mod fingerprint;
+pub mod http;
 pub mod immutable;
 pub mod retryable;
 pub mod str_sanitize;