Contentstack 1.8.2__tar.gz → 1.10.0__tar.gz

{Contentstack-1.8.2 → contentstack-1.10.0}/Contentstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Contentstack
-Version: 1.8.2
+Version: 1.10.0
 Summary: Contentstack is a headless CMS with an API-first approach.
 Home-page: https://github.com/contentstack/contentstack-python
 Author: Contentstack

{Contentstack-1.8.2 → contentstack-1.10.0}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012 - 2023 Contentstack. All rights reserved.
+Copyright (c) 2012 - 2024 Contentstack. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{Contentstack-1.8.2 → contentstack-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Contentstack
-Version: 1.8.2
+Version: 1.10.0
 Summary: Contentstack is a headless CMS with an API-first approach.
 Home-page: https://github.com/contentstack/contentstack-python
 Author: Contentstack

{Contentstack-1.8.2 → contentstack-1.10.0}/contentstack/__init__.py

@@ -22,7 +22,7 @@ __all__ = (
 __title__ = 'contentstack-delivery-python'
 __author__ = 'contentstack'
 __status__ = 'debug'
-__version__ = 'v1.8.2'
+__version__ = 'v1.10.0'
 __endpoint__ = 'cdn.contentstack.io'
 __email__ = 'mobile@contentstack.com'
 __developer_email__ = 'shailesh.mishra@contentstack.com'

{Contentstack-1.8.2 → contentstack-1.10.0}/contentstack/assetquery.py

@@ -176,6 +176,6 @@ class AssetQuery(BaseQuery):
 
         """
         if self.parameters is not None and len(self.parameters) > 0:
-            self.asset_query_params["query"] = json.dumps(self.parameters)
+            self.asset_query_params["query"] = self.parameters
         url = Utils.get_complete_url(self.base_url, self.asset_query_params)
         return self.http_instance.get(url)

{Contentstack-1.8.2 → contentstack-1.10.0}/contentstack/stack.py

@@ -21,6 +21,7 @@ class ContentstackRegion(enum.Enum):
     EU = 'eu'
     AZURE_NA = 'azure-na'
     AZURE_EU = 'azure-eu'
+    GCP_NA = 'gcp-na'
 
 
 class Stack:
@@ -116,6 +117,8 @@ class Stack:
             self.host = 'azure-na-cdn.contentstack.com'
         elif self.region.value == 'azure-eu' and self.host == DEFAULT_HOST:
             self.host = 'azure-eu-cdn.contentstack.com'
+        elif self.region.value == 'gcp-na' and self.host == DEFAULT_HOST:
+            self.host = 'gcp-na-cdn.contentstack.com'
         elif self.region.value != 'us':
             self.host = f'{self.region.value}-{DEFAULT_HOST}'
         self.endpoint = f'https://{self.host}/{self.version}'

{Contentstack-1.8.2 → contentstack-1.10.0}/contentstack/utility.py

@@ -5,7 +5,7 @@ Copyright 2019 Contentstack. All rights reserved.
 
 import json
 import logging
-from urllib import parse
+from urllib.parse import urlencode, urljoin
 
 log = logging.getLogger(__name__)
 
@@ -55,14 +55,22 @@ class Utils:
         return parse.urlencode(params)
 
     @staticmethod
-    def get_complete_url(base_url: str, params: dict):
+    def get_complete_url(base_url: str, params: dict) -> str:
         """
-        creates complete url using base_url and their respective parameters
-        :param base_url:
-        :param params:
-        :return:
+        Creates a complete URL using base_url and their respective parameters.
+        :param base_url: The base URL to which parameters are appended.
+        :param params: A dictionary of parameters to be included in the URL.
+        :return: A complete URL with encoded parameters.
         """
+        # Ensure 'query' is properly serialized as a JSON string without extra quotes
         if 'query' in params:
-            params["query"] = json.dumps(params["query"])
-        query = parse.urlencode(params)
-        return f'{base_url}&{query}'
+            params["query"] = json.dumps(params["query"], separators=(',', ':'))
+
+        # Encode parameters
+        query_string = urlencode(params, doseq=True)
+        
+        # Join base_url and query_string
+        if '?' in base_url:
+            return f'{base_url}&{query_string}'
+        else:
+            return f'{base_url}?{query_string}'

{Contentstack-1.8.2 → contentstack-1.10.0}/tests/test_stack.py

@@ -28,6 +28,11 @@ class TestStack(unittest.TestCase):
             API_KEY, DELIVERY_TOKEN, ENVIRONMENT, region=ContentstackRegion.EU)
         self.assertEqual('eu-cdn.contentstack.com', stack_region.host)
 
+    def test_02_stack_gcp_na_region(self):
+        stack_region = contentstack.Stack(
+            API_KEY, DELIVERY_TOKEN, ENVIRONMENT, region=ContentstackRegion.GCP_NA)
+        self.assertEqual('gcp-na-cdn.contentstack.com', stack_region.host)
+
     def test_03_stack_endpoint(self):
         self.assertEqual(f"https://{config.HOST}/v3",
                          self.stack.endpoint)