Add mime_type to all input sources and make use of it in create_file_part()

Fixes 64bit#364

Author: spantaleev

async-openai/src/types/audio.rs

@@ -8,6 +8,7 @@ use crate::error::OpenAIError;
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct AudioInput {
     pub source: InputSource,
+    pub mime_type: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, Default, Clone, Copy, PartialEq)]

async-openai/src/types/file.rs

@@ -8,6 +8,7 @@ use super::InputSource;
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct FileInput {
     pub source: InputSource,
+    pub mime_type: String,
 }
 
 #[derive(Debug, Default, Clone, PartialEq)]

async-openai/src/types/image.rs

@@ -136,6 +136,7 @@ pub struct ImagesResponse {
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct ImageInput {
     pub source: InputSource,
+    pub mime_type: String,
 }
 
 #[derive(Debug, Clone, Default, Builder, PartialEq)]

async-openai/src/types/impls.rs

@@ -132,15 +132,17 @@ impl Default for InputSource {
 macro_rules! impl_input {
     ($for_typ:ty) => {
         impl $for_typ {
-            pub fn from_bytes(filename: String, bytes: Bytes) -> Self {
+            pub fn from_bytes(filename: String, bytes: Bytes, mime_type: String) -> Self {
                 Self {
                     source: InputSource::Bytes { filename, bytes },
+                    mime_type,
                 }
             }
 
-            pub fn from_vec_u8(filename: String, vec: Vec<u8>) -> Self {
+            pub fn from_vec_u8(filename: String, vec: Vec<u8>, mime_type: String) -> Self {
                 Self {
                     source: InputSource::VecU8 { filename, vec },
+                    mime_type,
                 }
             }
         }
@@ -150,6 +152,7 @@ macro_rules! impl_input {
                 let path_buf = path.as_ref().to_path_buf();
                 Self {
                     source: InputSource::Path { path: path_buf },
+                    mime_type: "application/octet-stream".to_string(),
                 }
             }
         }
@@ -832,7 +835,7 @@ impl AsyncTryFrom<CreateTranscriptionRequest> for reqwest::multipart::Form {
     type Error = OpenAIError;
 
     async fn try_from(request: CreateTranscriptionRequest) -> Result<Self, Self::Error> {
-        let audio_part = create_file_part(request.file.source).await?;
+        let audio_part = create_file_part(request.file.source, request.file.mime_type).await?;
 
         let mut form = reqwest::multipart::Form::new()
             .part("file", audio_part)
@@ -868,7 +871,7 @@ impl AsyncTryFrom<CreateTranslationRequest> for reqwest::multipart::Form {
     type Error = OpenAIError;
 
     async fn try_from(request: CreateTranslationRequest) -> Result<Self, Self::Error> {
-        let audio_part = create_file_part(request.file.source).await?;
+        let audio_part = create_file_part(request.file.source, request.file.mime_type).await?;
 
         let mut form = reqwest::multipart::Form::new()
             .part("file", audio_part)
@@ -897,12 +900,12 @@ impl AsyncTryFrom<CreateImageEditRequest> for reqwest::multipart::Form {
             .text("prompt", request.prompt);
 
         for image in request.image {
-            let image_part = create_file_part(image.source).await?;
+            let image_part = create_file_part(image.source, image.mime_type).await?;
             form = form.part("image[]", image_part);
         }
 
         if let Some(mask) = request.mask {
-            let mask_part = create_file_part(mask.source).await?;
+            let mask_part = create_file_part(mask.source, mask.mime_type).await?;
             form = form.part("mask", mask_part);
         }
 
@@ -936,7 +939,7 @@ impl AsyncTryFrom<CreateImageVariationRequest> for reqwest::multipart::Form {
     type Error = OpenAIError;
 
     async fn try_from(request: CreateImageVariationRequest) -> Result<Self, Self::Error> {
-        let image_part = create_file_part(request.image.source).await?;
+        let image_part = create_file_part(request.image.source, request.image.mime_type).await?;
 
         let mut form = reqwest::multipart::Form::new().part("image", image_part);
 
@@ -970,7 +973,7 @@ impl AsyncTryFrom<CreateFileRequest> for reqwest::multipart::Form {
     type Error = OpenAIError;
 
     async fn try_from(request: CreateFileRequest) -> Result<Self, Self::Error> {
-        let file_part = create_file_part(request.file.source).await?;
+        let file_part = create_file_part(request.file.source, request.file.mime_type).await?;
         let form = reqwest::multipart::Form::new()
             .part("file", file_part)
             .text("purpose", request.purpose.to_string());
@@ -982,7 +985,7 @@ impl AsyncTryFrom<AddUploadPartRequest> for reqwest::multipart::Form {
     type Error = OpenAIError;
 
     async fn try_from(request: AddUploadPartRequest) -> Result<Self, Self::Error> {
-        let file_part = create_file_part(request.data).await?;
+        let file_part = create_file_part(request.data, request.mime_type).await?;
         let form = reqwest::multipart::Form::new().part("data", file_part);
         Ok(form)
     }

async-openai/src/types/upload.rs

@@ -112,6 +112,9 @@ pub struct UploadPart {
 pub struct AddUploadPartRequest {
     /// The chunk of bytes for this Part
     pub data: InputSource,
+
+    /// The MIME type of the file.
+    pub mime_type: String,
 }
 
 /// Request parameters for completing an Upload

async-openai/src/util.rs

@@ -28,6 +28,7 @@ pub(crate) async fn file_stream_body(source: InputSource) -> Result<Body, OpenAI
 /// Creates the part for the given file for multipart upload.
 pub(crate) async fn create_file_part(
     source: InputSource,
+    mime_type: String,
 ) -> Result<reqwest::multipart::Part, OpenAIError> {
     let (stream, file_name) = match source {
         InputSource::Path { path } => {
@@ -54,7 +55,7 @@ pub(crate) async fn create_file_part(
 
     let file_part = reqwest::multipart::Part::stream(stream)
         .file_name(file_name)
-        .mime_str("application/octet-stream")
+        .mime_str(&mime_type)
         .unwrap();
 
     Ok(file_part)