Merge pull request #23 from erhant/main

fix: gemini error reporters
andthattoo · Nov 8, 2024 · 7dde4dc · 7dde4dc
2 parents 47df3be + a8eb059
commit 7dde4dc
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/src/api_interface/gem_api.rs b/src/api_interface/gem_api.rs
@@ -5,7 +5,7 @@ use ollama_rs::{
 };
 use reqwest::Client;
 use serde_json::{json, Value};
-use std::sync::Arc;
+use std::{error::Error, sync::Arc};
 
 pub struct GeminiExecutor {
     model: String,
@@ -80,7 +80,18 @@ impl GeminiExecutor {
             .json(&body)
             .send()
             .await
-            .map_err(|e| OllamaError::from(format!("Gemini API request failed: {}", e)))?;
+            .map_err(|e| {
+                OllamaError::from(format!("Gemini API request failed: {:?}", e.source()))
+            })?;
+
+        // check status
+        if let Err(e) = response.error_for_status_ref() {
+            return Err(OllamaError::from(format!(
+                "Gemini API request failed with status {}: {:?}",
+                response.status(),
+                e.source()
+            )));
+        }
 
         let response_body: Value = response.json().await.map_err(|e| {
             OllamaError::from(format!("Failed to parse Gemini API response: {}", e))
@@ -167,7 +178,18 @@ impl GeminiExecutor {
             .json(&body)
             .send()
             .await
-            .map_err(|e| OllamaError::from(format!("Gemini API request failed: {:?}", e)))?;
+            .map_err(|e| {
+                OllamaError::from(format!("Gemini API request failed: {:?}", e.source()))
+            })?;
+
+        // check status
+        if let Err(e) = response.error_for_status_ref() {
+            return Err(OllamaError::from(format!(
+                "Gemini API request failed with status {}: {:?}",
+                response.status(),
+                e.source()
+            )));
+        }
 
         let response_body: Value = response.json().await.map_err(|e| {
             OllamaError::from(format!("Failed to parse Gemini API response: {:?}", e))