added support for providing content type for bytes file uploaded

Author: DinisCruz

osbot_aws/aws/s3/S3.py

@@ -290,8 +290,8 @@ def file_copy(self, bucket_source, key_source, bucket_destination, key_destinati
             kwargs_file_copy['ContentType'] = content_type
         return self.client().copy_object(**kwargs_file_copy)
 
-    def file_create_from_bytes(self, file_bytes, bucket, key, metadata=None):
-        return self.file_upload_from_bytes(file_body=file_bytes,  bucket=bucket, key=key, metadata=metadata)
+    def file_create_from_bytes(self, file_bytes, bucket, key, metadata=None, content_type=None):
+        return self.file_upload_from_bytes(file_body=file_bytes,  bucket=bucket, key=key, metadata=metadata, content_type=content_type)
 
     def file_create_from_string_as_gzip(self, file_contents, bucket, key):
         import gzip
@@ -381,11 +381,11 @@ def file_upload(self,file , bucket, folder):
         self.file_upload_to_key(file, bucket, key)                                # upload file
         return key                                                              # return path to file uploaded (if succeeded)
 
-    def file_upload_from_bytes(self, file_body, bucket, key, metadata=None):
-        if type(metadata) is not dict:
-            metadata = {}
+    def file_upload_from_bytes(self, file_body, bucket, key, metadata=None, content_type=None):
+        if type(metadata) is not dict: metadata = {}
+        if content_type   is None    : content_type = S3_DEFAULT_FILE_CONTENT_TYPE
         metadata['created_by'] = 'osbot_aws.aws.s3.S3.file_upload_from_bytes'
-        self.s3().put_object(Body=file_body, Bucket=bucket, Key=key, Metadata=metadata)             # todo: see if there are use cases that need the version_Id, since at moment we only return True (which basically represents a lack of an error/exception)
+        self.s3().put_object(Body=file_body, Bucket=bucket, Key=key, Metadata=metadata, ContentType=content_type)             # todo: see if there are use cases that need the version_Id, since at moment we only return True (which basically represents a lack of an error/exception)
         return True
 
     def file_upload_to_key(self, file, bucket, key, set_content_type=True):

osbot_aws/aws/s3/S3__DB_Base.py

@@ -128,22 +128,24 @@ def s3_folder_files__all(self, folder='', full_path=True):
     def s3_folder_list(self, folder='', return_full_path=False):
         return self.s3().folder_list(s3_bucket=self.s3_bucket(), parent_folder=folder, return_full_path=return_full_path)
 
-    def s3_save_bytes(self,data, s3_key, metadata=None ):
-        kwargs = dict(bucket   = self.s3_bucket(),
-                      key       = s3_key        ,
-                      file_body = data          ,
-                      metadata  = metadata)
+    def s3_save_bytes(self,data, s3_key, metadata=None , content_type=None):
+        kwargs = dict(bucket       = self.s3_bucket(),
+                      key          = s3_key        ,
+                      file_body    = data          ,
+                      metadata     = metadata      ,
+                      content_type = content_type  )
         return self.s3().file_upload_from_bytes(**kwargs)
 
-    def s3_save_data(self, data, s3_key, metadata=None):
+    def s3_save_data(self, data, s3_key, metadata=None, content_type=None):
         from osbot_utils.utils.Json import json_dumps, json_to_gz
 
         if self.save_as_gz:
             data      = json_to_gz(data)
         kwargs = dict(bucket=self.s3_bucket(), key=s3_key)
         if type(data) == bytes:
-            kwargs['file_body'] = data
-            kwargs['metadata' ] = metadata
+            kwargs['file_body'   ] = data
+            kwargs['metadata'    ] = metadata
+            kwargs['content_type'] = content_type
             return self.s3().file_upload_from_bytes(**kwargs)
         else:
             data_as_str = json_dumps(data)