Merge pull request tjardoo#41 from tjardoo/fix-unwrap-missing-headers-exception

Fix unwrap missing headers exception

Author: tjardoo

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "openai_dive"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 license = "MIT"
 description = "OpenAI Dive is an unofficial async Rust library that allows you to interact with the OpenAI API."

Cargo.toml

@@ -22,22 +22,22 @@ pub struct ResponseWrapper<T> {
 pub struct Headers {
     /// The maximum number of requests that are permitted before exhausting the rate limit.
     #[serde(rename = "x-ratelimit-limit-requests")]
-    pub x_ratelimit_limit_requests: u32,
+    pub x_ratelimit_limit_requests: Option<u32>,
     /// The maximum number of tokens that are permitted before exhausting the rate limit.
     #[serde(rename = "x-ratelimit-limit-tokens")]
-    pub x_ratelimit_limit_tokens: u32,
+    pub x_ratelimit_limit_tokens: Option<u32>,
     /// The remaining number of requests that are permitted before exhausting the rate limit.
     #[serde(rename = "x-ratelimit-remaining-requests")]
-    pub x_ratelimit_remaining_requests: u32,
+    pub x_ratelimit_remaining_requests: Option<u32>,
     /// The remaining number of tokens that are permitted before exhausting the rate limit.
     #[serde(rename = "x-ratelimit-remaining-tokens")]
-    pub x_ratelimit_remaining_tokens: u32,
+    pub x_ratelimit_remaining_tokens: Option<u32>,
     /// The time until the rate limit (based on requests) resets to its initial state.
     #[serde(rename = "x-ratelimit-reset-requests")]
-    pub x_ratelimit_reset_requests: String,
+    pub x_ratelimit_reset_requests: Option<String>,
     /// The time until the rate limit (based on tokens) resets to its initial state.
     #[serde(rename = "x-ratelimit-reset-tokens")]
-    pub x_ratelimit_reset_tokens: String,
+    pub x_ratelimit_reset_tokens: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
@@ -103,47 +103,76 @@ pub enum StopToken {
 
 impl From<HeaderMap> for Headers {
     fn from(value: HeaderMap) -> Self {
+        if value.get("x-ratelimit-limit-requests").is_none()
+            || value.get("x-ratelimit-limit-tokens").is_none()
+            || value.get("x-ratelimit-remaining-requests").is_none()
+            || value.get("x-ratelimit-remaining-tokens").is_none()
+            || value.get("x-ratelimit-reset-requests").is_none()
+            || value.get("x-ratelimit-reset-tokens").is_none()
+        {
+            return Self {
+                x_ratelimit_limit_requests: None,
+                x_ratelimit_limit_tokens: None,
+                x_ratelimit_remaining_requests: None,
+                x_ratelimit_remaining_tokens: None,
+                x_ratelimit_reset_requests: None,
+                x_ratelimit_reset_tokens: None,
+            };
+        }
+
         Self {
-            x_ratelimit_limit_requests: value
-                .get("x-ratelimit-limit-requests")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .parse::<u32>()
-                .unwrap(),
-            x_ratelimit_limit_tokens: value
-                .get("x-ratelimit-limit-tokens")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .parse::<u32>()
-                .unwrap(),
-            x_ratelimit_remaining_requests: value
-                .get("x-ratelimit-remaining-requests")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .parse::<u32>()
-                .unwrap(),
-            x_ratelimit_remaining_tokens: value
-                .get("x-ratelimit-remaining-tokens")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .parse::<u32>()
-                .unwrap(),
-            x_ratelimit_reset_requests: value
-                .get("x-ratelimit-reset-requests")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .to_string(),
-            x_ratelimit_reset_tokens: value
-                .get("x-ratelimit-reset-tokens")
-                .unwrap()
-                .to_str()
-                .unwrap()
-                .to_string(),
+            x_ratelimit_limit_requests: Some(
+                value
+                    .get("x-ratelimit-limit-requests")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .parse::<u32>()
+                    .unwrap(),
+            ),
+            x_ratelimit_limit_tokens: Some(
+                value
+                    .get("x-ratelimit-limit-tokens")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .parse::<u32>()
+                    .unwrap(),
+            ),
+            x_ratelimit_remaining_requests: Some(
+                value
+                    .get("x-ratelimit-remaining-requests")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .parse::<u32>()
+                    .unwrap(),
+            ),
+            x_ratelimit_remaining_tokens: Some(
+                value
+                    .get("x-ratelimit-remaining-tokens")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .parse::<u32>()
+                    .unwrap(),
+            ),
+            x_ratelimit_reset_requests: Some(
+                value
+                    .get("x-ratelimit-reset-requests")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .to_string(),
+            ),
+            x_ratelimit_reset_tokens: Some(
+                value
+                    .get("x-ratelimit-reset-tokens")
+                    .unwrap()
+                    .to_str()
+                    .unwrap()
+                    .to_string(),
+            ),
         }
     }
 }