fix: fix query params implementation

Author: MrDHat

README.md

@@ -162,7 +162,8 @@ https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg?tr=f-jpg%2Cpr
     image_url = imagekit.url({
         "path": "/default-image",
         "query_parameters": {
-                    "v": "123"
+            "p1": "123",
+            "p2": "345"
         },
         "transformation": [{
             "height": "300",

imagekitio/url.py

@@ -50,7 +50,8 @@ def build_url(self, options: dict) -> str:
             raise ValueError(ERRORS.INVALID_TRANSFORMATION_POSITION.value)
 
         if src or (
-            options.get("transformation_position") == QUERY_TRANSFORMATION_POSITION
+            options.get(
+                "transformation_position") == QUERY_TRANSFORMATION_POSITION
         ):
             src_param_used_for_url = True
         else:
@@ -86,7 +87,8 @@ def build_url(self, options: dict) -> str:
             result_url_dict["path"] = parsed_url.path
             src_param_used_for_url = True
         query_params = options.get("query_parameters", {})
-        transformation_str = self.transformation_to_str(options.get("transformation"))
+        transformation_str = self.transformation_to_str(
+            options.get("transformation"))
         if transformation_str:
             if (
                 transformation_position == Default.QUERY_TRANSFORMATION_POSITION.value
@@ -114,7 +116,8 @@ def build_url(self, options: dict) -> str:
             expiry_timestamp = self.get_signature_timestamp(expire_seconds)
 
             # Temporary variable to generate the URL signature
-            modified_result_url_dict = self.prepare_dict_for_unparse(result_url_dict)
+            modified_result_url_dict = self.prepare_dict_for_unparse(
+                result_url_dict)
             intermediate_url = urlunparse(
                 modified_result_url_dict.get(f, "") for f in ParseResult._fields
             )
@@ -139,6 +142,7 @@ def build_url(self, options: dict) -> str:
         generated_url = urlunparse(
             result_url_dict.get(f, "") for f in ParseResult._fields
         )
+
         if result_url_dict["query"]:
             generated_url = (
                 generated_url + "&ik-sdk-version=" + Default.SDK_VERSION.value
@@ -147,6 +151,16 @@ def build_url(self, options: dict) -> str:
             generated_url = (
                 generated_url + "?ik-sdk-version=" + Default.SDK_VERSION.value
             )
+
+        extra_query_parameters = options.get("query_parameters")
+        if extra_query_parameters is not None:
+            extra_query_parameters_str = "&".join(
+                str(k) + "=" + str(v) for k, v in extra_query_parameters.items()
+            )
+            generated_url = (
+                generated_url + "&" + extra_query_parameters_str
+            )
+
         return generated_url
 
     @staticmethod
@@ -188,7 +202,7 @@ def get_signature(private_key, url, url_endpoint, expiry_timestamp) -> str:
             expiry_timestamp = DEFAULT_TIMESTAMP
 
         replaced_url = url.replace(url_endpoint, "") + str(expiry_timestamp)
-        
+
         signature = hmac.new(
             key=private_key.encode(), msg=replaced_url.encode(), digestmod=hashlib.sha1
         )
@@ -243,6 +257,7 @@ def transformation_to_str(transformation):
                         )
                     )
 
-            parsed_transforms.append(TRANSFORM_DELIMITER.join(parsed_transform_step))
+            parsed_transforms.append(
+                TRANSFORM_DELIMITER.join(parsed_transform_step))
 
         return CHAIN_TRANSFORM_DELIMITER.join(parsed_transforms)

tests/test_generate_url.py

@@ -93,11 +93,10 @@ def test_overriding_url_endpoint_without_slash_generation_consists_new_url(self)
     def test_generate_url_query_parameters(self):
         options = {
             "path": "/default-image.jpg",
-            "query_parameters" : [
-                {
-                    "param1" : "value1"
-                }
-            ],
+            "query_parameters": {
+                "param1": "value1",
+                "param2": "value2"
+            },
             "transformation": [
                 {
                     "height": "300",
@@ -108,9 +107,9 @@ def test_generate_url_query_parameters(self):
         url = self.client.url(options)
         self.assertEqual(
             url,
-            "https://test-domain.com/test-endpoint/tr:h-300,w-400/default-image.jpg?param1=value1&ik-sdk-version={}".format(
+            "https://test-domain.com/test-endpoint/tr:h-300,w-400/default-image.jpg?ik-sdk-version={}".format(
                 Default.SDK_VERSION.value
-            ),
+            ) + "&param1=value1&param2=value2",
         )
 
     def test_generate_url_with_src(self):
@@ -138,11 +137,9 @@ def test_generate_url_with_src(self):
     def test_generate_url_with_src_with_query_params_double(self):
         options = {
             "src": "https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?queryparam1=value1",
-            "query_parameters" : [
-                {
-                    "param1" : "value1"
-                }
-            ],
+            "query_parameters": {
+                "param1": "value1"
+            },
             "transformation": [
                 {
                     "height": "300",
@@ -158,9 +155,9 @@ def test_generate_url_with_src_with_query_params_double(self):
         # @TODO - adjust value of param1=value1 in test case but it should be there
         self.assertEqual(
             url,
-            "https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?queryparam1=value1&param1=value1&tr=h-300,w-400,f-jpg,pr-true,e-contrast-1:rt-90&ik-sdk-version={}".format(
+            "https://ik.imagekit.io/ldt7znpgpjs/test_YhNhoRxWt.jpg?queryparam1=value1&tr=h-300,w-400,f-jpg,pr-true,e-contrast-1:rt-90&ik-sdk-version={}".format(
                 Default.SDK_VERSION.value
-            ),
+            ) + "&param1=value1",
         )
 
     def test_generate_url_with_path_and_signed(self):