Merge pull request #46 from aman-squareboat/bugfixes/3.0.1

Fix issue #35 #37 #41 #44

Author: imagekitio

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
     build:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 python: [3.6, 3.7, 3.8, 3.9, '3.10']

imagekitio/file.py

@@ -63,6 +63,7 @@
     convert_to_response_metadata_result_object,
 )
 
+from io import BufferedReader
 
 class File(object):
     def __init__(self, request_obj):
@@ -93,7 +94,9 @@ def upload(
             options = self.validate_upload(options.__dict__)
         if options is False:
             raise ValueError("Invalid upload options")
-        if isinstance(file, str) or isinstance(file, bytes):
+        if isinstance(file,BufferedReader):
+            files.update({"file": (file_name,file,None)})
+        elif isinstance(file, str) or isinstance(file, bytes):
             files.update({"file": (None, file)})
         if "overwriteAiTags" in options:
             options["overwriteAITags"] = options["overwriteAiTags"]

imagekitio/models/results/EmbeddedMetadata.py

@@ -1,6 +1,7 @@
 class EmbeddedMetadata:
-    def __init__(self, x_resolution=None, y_resolution=None, date_created=None, date_timecreated=None):
+    def __init__(self, x_resolution=None, y_resolution=None, date_created=None, date_time_created=None):
         self.x_resolution = x_resolution
         self.y_resolution = y_resolution
         self.date_created = date_created
-        self.date_timecreated = date_timecreated
+        self.date_time_created = date_time_created
+

imagekitio/models/results/UploadFileResult.py

@@ -57,7 +57,7 @@ def __init__(
                     embedded_metadata["x_resolution"],
                     embedded_metadata["y_resolution"],
                     embedded_metadata["date_created"],
-                    embedded_metadata["date_timecreated"],
+                    embedded_metadata["date_time_created"],
                 )
         self.extension_status = extension_status
         self.file_type = file_type

imagekitio/url.py

@@ -23,6 +23,9 @@ def __init__(self, request_obj):
 
     def generate_url(self, options: Dict = None) -> str:
         options = camel_dict_to_snake_dict(options)
+        attachment = options.get("query_parameters",{}).get("ik-attachment")
+        if attachment:
+            options["query_parameters"]["ik-attachment"] = str(attachment).lower()
         extended_options = self.request.extend_url_options(options)
         return self.build_url(extended_options)
 
@@ -192,8 +195,8 @@ def transformation_to_str(transformation):
                         value = value.strip("/")
                         value = value.replace("/", "@@")
                     if transform_key == "raw":
-                        for i in value.split(","):
-                            parsed_transform_step.append(i)
+                        for j in value.split(","):
+                            parsed_transform_step.append(j)
                     else:
                         parsed_transform_step.append(
                             "{}{}{}".format(

imagekitio/utils/utils.py

@@ -76,7 +76,11 @@ def throw_other_exception(response: Response):
 
 
 def convert_to_response_object(resp: Response, response_object):
-    res_new = loads(dumps(camel_dict_to_snake_dict(resp.json())))
+    resp_json = resp.json()
+    embeddedMetadata = resp_json.get("embeddedMetadata")
+    if embeddedMetadata != None:
+        resp_json["embeddedMetadata"] = camel_dict_to_snake_dict(embeddedMetadata)
+    res_new = loads(dumps(camel_dict_to_snake_dict(resp_json)))
     u = response_object(**res_new)
     u.response_metadata = ResponseMetadata(resp.json(), resp.status_code, resp.headers)
     return u

requirements/requirements.txt

@@ -1,2 +1,3 @@
 requests>=2.22.0
-requests_toolbelt==0.9.1
+requests_toolbelt==0.10.1
+urllib3==1.26.15

requirements/test.txt

@@ -3,4 +3,5 @@ black==19.10b0
 coverage==4.5.4
 tox==3.14.2
 responses==0.17.0
-requests_toolbelt==0.9.1
+requests_toolbelt==0.10.1
+urllib3==1.26.15

tests/test_files_ops.py

@@ -11,7 +11,6 @@ def setUp(self) -> None:
             public_key="public_key_test",
             url_endpoint="https://test-domain.com/test-endpoint",
         )
-
     def test_generate_url_with_path(self):
         options = {
             "path": "/default-image.jpg",
@@ -22,7 +21,32 @@ def test_generate_url_with_path(self):
             url,
             "https://test-domain.com/test-endpoint/tr:h-300,w-400/default-image.jpg",
         )
+    def test_generate_url_with_path_with_ik_attachment(self):
+        options = {
+            "path": "/default-image.jpg",
+            "transformation": [{"height": "300", "width": "400"}],
+            "query_parameters": {
+                "ik-attachment":True
+            },
+        }
+        url = self.client.url(options)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/tr:h-300,w-400/default-image.jpg?ik-attachment=true",
+        )
 
+    def test_generate_url_With_path_with_transformation_raw(self):
+        options = {
+            "path": "/default-image.jpg",
+            "transformation": [{"raw":"f-auto","height": "300", "width": "400"}],
+
+        }
+        url = self.client.url(options)
+        self.assertEqual(
+            url,
+            "https://test-domain.com/test-endpoint/tr:f-auto,h-300,w-400/default-image.jpg",
+        )
+    
     def test_overriding_url_endpoint_generation_consists_new_url(self):
         """
         Overriding urlEndpoint parameter. Passing a urlEndpoint value which is