GabrielTofvesson/OpenAI-Rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting and error handling

Browse Source
This commit is contained in:
Gabriel Tofvesson 2023-03-18 15:57:59 +01:00
parent ad68ecd7ab
commit b18fbd7f34
No known key found for this signature in database
GPG Key ID: 6F1345DF28EDA13E
12 changed files with 135 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chat.rs
View File

@ -112,6 +112,14 @@ pub struct ChatCompletionResponse {
impl Context {
pub async fn create_chat_completion(&self, chat_completion_request: ChatHistory) -> anyhow::Result<ChatCompletionResponse> {
Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/chat/completions"))).json(&chat_completion_request).send().await?.json::<ChatCompletionResponse>().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::<ChatCompletionResponse>()
.await?
)
}
}

10
src/completion.rs
View File

@ -134,6 +134,14 @@ pub struct CompletionResponse {
impl Context {
pub async fn create_completion(&self, completion_request: CompletionRequest) -> anyhow::Result<CompletionResponse> {
Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/completions")).json(&completion_request)).send().await?.json::<CompletionResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/completions")))
.json(&completion_request)
.send()
.await?
.error_for_status()?
.json::<CompletionResponse>()
.await?
)
}
}

12
src/edits.rs
View File

@ -39,7 +39,15 @@ pub struct EditResponse {
}
impl Context {
pub async fn create_edit(&self, edit_request: EditRequest) -> anyhow::Result<crate::edits::EditResponse> {
Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/edits")).json(&edit_request)).send().await?.json::<EditResponse>().await?)
pub async fn create_edit(&self, edit_request: EditRequest) -> anyhow::Result<EditResponse> {
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/edits")))
.json(&edit_request)
.send()
.await?
.error_for_status()?
.json::<EditResponse>()
.await?
)
}
}

10
src/embedding.rs
View File

@ -38,6 +38,14 @@ pub struct EmbeddingResponse {
impl Context {
pub async fn create_embedding(&self, embedding_request: EmbeddingRequest) -> anyhow::Result<EmbeddingResponse> {
Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/embeddings")).json(&embedding_request)).send().await?.json::<EmbeddingResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/embeddings")))
.json(&embedding_request)
.send()
.await?
.error_for_status()?
.json::<EmbeddingResponse>()
.await?
)
}
}

38
src/file.rs
View File

@ -23,8 +23,15 @@ pub struct FileDeleteResponse {
impl Context {
pub async fn get_files(&self) -> anyhow::Result<Vec<FileInfo>> {
Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files"))).send().await?.json::<DataList<FileInfo>>().await?.data)
Ok(
self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/files")))
.send()
.await?
.error_for_status()?
.json::<DataList<FileInfo>>()
.await?
.data
)
}
pub async fn upload_file(&self, file: FileResource, file_name: String, purpose: String) -> anyhow::Result<FileInfo> {
@ -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::<FileInfo>()
.await?
)
}
pub async fn delete_file(&self, file_id: &str) -> anyhow::Result<FileDeleteResponse> {
Ok(self.with_auth(Client::builder().build()?.delete(&format!("{API_URL}/v1/files/{file_id}"))).send().await?.json::<FileDeleteResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.delete(&format!("{API_URL}/v1/files/{file_id}")))
.send()
.await?
.error_for_status()?
.json::<FileDeleteResponse>()
.await?
)
}
pub async fn get_file(&self, file_id: &str) -> anyhow::Result<impl futures_core::Stream<Item = reqwest::Result<Bytes>>> {
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<Bytes> {
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?
)
}
}

12
src/image.rs
View File

@ -105,7 +105,15 @@ pub struct ImageResponse {
}
impl Context {
pub async fn create_image(&self, image_request: crate::image::ImageRequest) -> anyhow::Result<crate::image::ImageResponse> {
Ok(self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/generations")).json(&image_request)).send().await?.json::<crate::image::ImageResponse>().await?)
pub async fn create_image(&self, image_request: ImageRequest) -> anyhow::Result<ImageResponse> {
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/generations")))
.json(&image_request)
.send()
.await?
.error_for_status()?
.json::<ImageResponse>()
.await?
)
}
}

10
src/image_edit.rs
View File

@ -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::<ImageResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/edits")))
.multipart(form)
.send()
.await?
.error_for_status()?
.json::<ImageResponse>()
.await?
)
}
}

10
src/image_variation.rs
View File

@ -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::<ImageResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/images/variations")))
.multipart(form)
.send()
.await?
.error_for_status()?
.json::<ImageResponse>()
.await?
)
}
}

19
src/model.rs
View File

@ -31,10 +31,25 @@ pub struct Model {
impl Context {
pub async fn get_models(&self) -> anyhow::Result<Vec<Model>> {
Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models"))).send().await?.json::<DataList<Model>>().await?.data)
Ok(
self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models")))
.send()
.await?
.error_for_status()?
.json::<DataList<Model>>()
.await?
.data
)
}
pub async fn get_model(&self, model_id: &str) -> anyhow::Result<Model> {
Ok(self.with_auth(Client::builder().build()?.get(&format!("{API_URL}/v1/models/{model_id}", model_id = model_id))).send().await?.json::<Model>().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::<Model>()
.await?
)
}
}

3
src/moderation.rs
View File

@ -45,7 +45,8 @@ pub struct ModerationResponse {
impl Context {
pub async fn create_moderation(&self, moderation_request: ModerationRequest) -> anyhow::Result<ModerationResponse> {
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()?

10
src/transcription.rs
View File

@ -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::<TranscriptionResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/transcriptions")))
.multipart(form)
.send()
.await?
.error_for_status()?
.json::<TranscriptionResponse>()
.await?
)
}
}

10
src/translation.rs
View File

@ -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::<TranslationResponse>().await?)
Ok(
self.with_auth(Client::builder().build()?.post(&format!("{API_URL}/v1/audio/translations")))
.multipart(form)
.send()
.await?
.error_for_status()?
.json::<TranslationResponse>()
.await?
)
}
}