From b18fbd7f3417276f2a6ff4c653ef3103f035d8e8 Mon Sep 17 00:00:00 2001 From: Gabriel Tofvesson Date: Sat, 18 Mar 2023 15:57:59 +0100 Subject: [PATCH] Fix formatting and error handling --- src/chat.rs | 10 +++++++++- src/completion.rs | 10 +++++++++- src/edits.rs | 12 ++++++++++-- src/embedding.rs | 10 +++++++++- src/file.rs | 38 +++++++++++++++++++++++++++++++++----- src/image.rs | 12 ++++++++++-- src/image_edit.rs | 10 +++++++++- src/image_variation.rs | 10 +++++++++- src/model.rs | 19 +++++++++++++++++-- src/moderation.rs | 3 ++- src/transcription.rs | 10 +++++++++- src/translation.rs | 10 +++++++++- 12 files changed, 135 insertions(+), 19 deletions(-) diff --git a/src/chat.rs b/src/chat.rs index 8650ee5..c8fa7fe 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -112,6 +112,14 @@ pub struct ChatCompletionResponse { impl Context { pub async fn create_chat_completion(&self, chat_completion_request: ChatHistory) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/chat/completions"))).json(&chat_completion_request).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/chat/completions"))) + .json(&chat_completion_request) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/completion.rs b/src/completion.rs index bf87ddb..d756f18 100644 --- a/src/completion.rs +++ b/src/completion.rs @@ -134,6 +134,14 @@ pub struct CompletionResponse { impl Context { pub async fn create_completion(&self, completion_request: CompletionRequest) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/completions")).json(&completion_request)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/completions"))) + .json(&completion_request) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/edits.rs b/src/edits.rs index 74f8d76..550f708 100644 --- a/src/edits.rs +++ b/src/edits.rs @@ -39,7 +39,15 @@ pub struct EditResponse { } impl Context { - pub async fn create_edit(&self, edit_request: EditRequest) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/edits")).json(&edit_request)).send().await?.json::().await?) + pub async fn create_edit(&self, edit_request: EditRequest) -> anyhow::Result { + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/edits"))) + .json(&edit_request) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/embedding.rs b/src/embedding.rs index 3a7a821..271fca1 100644 --- a/src/embedding.rs +++ b/src/embedding.rs @@ -38,6 +38,14 @@ pub struct EmbeddingResponse { impl Context { pub async fn create_embedding(&self, embedding_request: EmbeddingRequest) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/embeddings")).json(&embedding_request)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/embeddings"))) + .json(&embedding_request) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/file.rs b/src/file.rs index 1bc2de2..2c2dfc1 100644 --- a/src/file.rs +++ b/src/file.rs @@ -23,8 +23,15 @@ pub struct FileDeleteResponse { impl Context { pub async fn get_files(&self) -> anyhow::Result> { - Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files"))).send().await?.json::>().await?.data) - + Ok( + self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files"))) + .send() + .await? + .error_for_status()? + .json::>() + .await? + .data + ) } pub async fn upload_file(&self, file: FileResource, file_name: String, purpose: String) -> anyhow::Result { @@ -33,20 +40,41 @@ impl Context { .multipart(file.write_file_named(Form::new().text("purpose", purpose), "file", file_name)) .send() .await? + .error_for_status()? .json::() .await? ) } pub async fn delete_file(&self, file_id: &str) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.delete(&format!("{API_URL}/v1/files/{file_id}"))).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.delete(&format!("{API_URL}/v1/files/{file_id}"))) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } pub async fn get_file(&self, file_id: &str) -> anyhow::Result>> { - Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files/{file_id}"))).send().await?.bytes_stream()) + Ok( + self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files/{file_id}"))) + .send() + .await? + .error_for_status()? + .bytes_stream() + ) } pub async fn get_file_direct(&self, file_id: &str) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files/{file_id}"))).send().await?.bytes().await?) + Ok( + self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files/{file_id}"))) + .send() + .await? + .error_for_status()? + .bytes() + .await? + ) } } \ No newline at end of file diff --git a/src/image.rs b/src/image.rs index 867a37e..7c556aa 100644 --- a/src/image.rs +++ b/src/image.rs @@ -105,7 +105,15 @@ pub struct ImageResponse { } impl Context { - pub async fn create_image(&self, image_request: crate::image::ImageRequest) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/generations")).json(&image_request)).send().await?.json::().await?) + pub async fn create_image(&self, image_request: ImageRequest) -> anyhow::Result { + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/generations"))) + .json(&image_request) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/image_edit.rs b/src/image_edit.rs index 4491ee4..089533c 100644 --- a/src/image_edit.rs +++ b/src/image_edit.rs @@ -51,6 +51,14 @@ impl Context { form = form.text("size", size.to_string()); } - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/edits")).multipart(form)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/edits"))) + .multipart(form) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/image_variation.rs b/src/image_variation.rs index a84d48d..8b0fb64 100644 --- a/src/image_variation.rs +++ b/src/image_variation.rs @@ -38,6 +38,14 @@ impl Context { form = form.text("size", size.to_string()); } - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/variations")).multipart(form)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/variations"))) + .multipart(form) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/model.rs b/src/model.rs index 4b79fe5..13443d6 100644 --- a/src/model.rs +++ b/src/model.rs @@ -31,10 +31,25 @@ pub struct Model { impl Context { pub async fn get_models(&self) -> anyhow::Result> { - Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models"))).send().await?.json::>().await?.data) + Ok( + self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models"))) + .send() + .await? + .error_for_status()? + .json::>() + .await? + .data + ) } pub async fn get_model(&self, model_id: &str) -> anyhow::Result { - Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models/{model_id}", model_id = model_id))).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models/{model_id}", model_id = model_id))) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/moderation.rs b/src/moderation.rs index 1f6fd24..06f3ba4 100644 --- a/src/moderation.rs +++ b/src/moderation.rs @@ -45,7 +45,8 @@ pub struct ModerationResponse { impl Context { pub async fn create_moderation(&self, moderation_request: ModerationRequest) -> anyhow::Result { Ok( - self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/moderations")).json(&moderation_request)) + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/moderations"))) + .json(&moderation_request) .send() .await? .error_for_status()? diff --git a/src/transcription.rs b/src/transcription.rs index 8490a73..54c80a2 100644 --- a/src/transcription.rs +++ b/src/transcription.rs @@ -104,6 +104,14 @@ impl Context { form = form.text("language", language.to_string()); } - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/transcriptions")).multipart(form)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/transcriptions"))) + .multipart(form) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file diff --git a/src/translation.rs b/src/translation.rs index 489438c..56cb430 100644 --- a/src/translation.rs +++ b/src/translation.rs @@ -40,6 +40,14 @@ impl Context { form = form.text("temperature", temperature.to_string()); } - Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/translations")).multipart(form)).send().await?.json::().await?) + Ok( + self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/translations"))) + .multipart(form) + .send() + .await? + .error_for_status()? + .json::() + .await? + ) } } \ No newline at end of file