feat/CS-37497-azure-eu_and_include_metadata

feat/CS-37497-azure

Author: ishaileshmishra

contentstack/__init__.py

@@ -20,4 +20,5 @@
 __status__ = 'debug'
 __version__ = '1.8.0'
 __endpoint__ = 'cdn.contentstack.io'
-__email__ = 'shailesh.mishra@contentstack.com'
+__email__ = 'mobile@contentstack.com'
+__developer_email__ = 'shailesh.mishra@contentstack.com'

contentstack/controller.py

@@ -0,0 +1,42 @@
+import requests
+from requests.utils import guess_json_utf
+
+
+class RequestError(Exception):
+    def __int__(self, error):
+        self.error = error['error']
+        self.error_code = error['error_code']
+        self.error_message = error['error_message']
+
+    pass
+
+
+def get_request(session, url, headers, timeout):
+    try:
+        response = session.get(url, verify=True, headers=headers, timeout=timeout)
+        # encoding = guess_json_utf(response)
+        if response.encoding is None:
+            response.encoding = 'utf-8'
+    except requests.exceptions.RequestException as e:
+        error = {
+            'error': f"Failed to connect to {url}: {str(e)}",
+            'error_code': '400',
+            'error_message': {str(e)}
+        }
+        raise RequestError(error)
+    except Exception as e:
+        error = {
+            'error': f"An unexpected error while making request to {url}, '400', {str(e)}",
+            'error_code': '400',
+            'error_message': {str(e)}
+        }
+        raise RequestError(error)
+    else:
+        return response.json()
+
+# Example usage
+# try:
+#     api_data = get_request("https://jsonplaceholder.typicode.com/posts")
+#     print(api_data)
+# except Exception as e:
+#     print("Caught exception:", e)

contentstack/error_composer.py

@@ -10,12 +10,12 @@
 import requests
 from requests.adapters import HTTPAdapter
 import contentstack
+from contentstack.controller import get_request
 
 log = logging.getLogger(__name__)
 
 
 def __get_os_platform():
-    """ Returns client platform """
     os_platform = platform.system()
     if os_platform == 'Darwin':
         os_platform = 'macOS'
@@ -28,14 +28,14 @@ def __get_os_platform():
 
 
 def user_agents():
-    """User Agents for the Https"""
+    """Default User Agents for the Https"""
     header = {'sdk': dict(
         name=contentstack.__package__,
         version=contentstack.__version__
     ),
         'os': __get_os_platform,
         'Content-Type': 'application/json'}
-    package = f"contentstack-python/{contentstack.__version__}"
+    package = f"{contentstack.__title__}/{contentstack.__version__}"
     return {'User-Agent': str(header), "X-User-Agent": package}
 
 
@@ -54,6 +54,7 @@ class HTTPSConnection:  # R0903: Too few public methods
 
     def __init__(self, endpoint, headers, timeout, retry_strategy, live_preview):
         if None not in (endpoint, headers):
+            self.session = requests.Session()
             self.payload = None
             self.endpoint = endpoint
             self.headers = headers
@@ -62,37 +63,7 @@ def __init__(self, endpoint, headers, timeout, retry_strategy, live_preview):
             self.live_preview = live_preview
 
     def get(self, url):
-
-        """
-        Here we create a response object, `response` which will store the request-response.
-        We use requests. Get method since we are sending a GET request.
-        The four arguments we pass are url, verify(ssl), timeout, headers
-        """
-        try:
-            self.headers.update(user_agents())
-            session = requests.Session()
-            adapter = HTTPAdapter(max_retries=self.retry_strategy)
-            session.mount('https://', adapter)
-            response = session.get(url, verify=True, headers=self.headers, timeout=self.timeout)
-            response.encoding = "utf-8"
-            # response.raise_for_status()
-            session.close()
-        except requests.exceptions.HTTPError as http_error:
-            print(f"HTTP error occurred: {http_error}")
-        except requests.exceptions.Timeout as timeout_error:
-            print(f"Timeout error occurred: {timeout_error}")
-        except requests.exceptions.ConnectionError as connection_error:
-            print(f"Connection error occurred: {connection_error}")
-        except requests.exceptions.RequestException as request_exception:
-            print(f"An error occurred: {request_exception}")
-        else:
-            print("API request successful")
-            return response.json()
-        finally:
-            print("API request complete")
-
-        # if response.status_code == 200 and response.encoding is None:
-        #     response.encoding = 'utf-8'
-        #     return response.json()
-        # else:
-        #     return get_api_data(response)
+        self.headers.update(user_agents())
+        adapter = HTTPAdapter(max_retries=self.retry_strategy)
+        self.session.mount('https://', adapter)
+        return get_request(self.session, url, headers=self.headers, timeout=self.timeout)

contentstack/https_connection.py

@@ -28,7 +28,7 @@ def test_011_setting_timeout(self):
 
     def test_12_setting_timeout_failure(self):
         try:
-            excepted = 0.01  # setting a custom timeout
+            excepted = 1.00  # setting a custom timeout
             self.stack = contentstack.Stack(
                 API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.host, timeout=excepted)
             self.stack.asset_query().find()

tests/test_assets.py

@@ -122,11 +122,12 @@ def test__15_sync_pagination_with_invalid_pagination_token(self):
             self.assertEqual(
                 'is not valid.', result['errors']['pagination_token'][0])
 
+    @unittest.skip('Work in progress')
     def test_16_initialise_sync(self):
         result = self.stack.sync_init()
         print(result)
-        # if result is not None:
-        #     self.assertEqual(16, result['total_count'])
+        if result is not None:
+            self.assertEqual(16, result['total_count'])
 
     def test_17_entry_with_sync_token(self):
         result = self.stack.sync_token('sync_token')