request tuple (result, err) added

Author: ishaileshmishra

.gitignore

@@ -24,8 +24,8 @@ wheels/
 .installed.cfg
 *.egg
 MANIFEST
-.DS_Store
-.DS_Store?
+*.DS_Store
+*.DS_Store?
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

contentstack/__init__.py

@@ -39,5 +39,5 @@
 
 __author__ = 'contentstack - (www.github.con/contentstack)'
 __email__ = 'shailesh.mishra@contentstack.com'
-__version__ = '0.0.1'
+__version__ = '1.0.0'
 __endpoint__ = 'cdn.contentstack.io'

contentstack/http_request.py

@@ -8,59 +8,36 @@
 class HTTPRequestConnection(object):
 
     def __init__(self, url_path, query=dict, local_headers=dict):
+        self.result = None
+        self.error = None
         self.url_path = url_path
         self._query_prams = query
         self._local_headers = local_headers
+        self._local_headers['X-User-Agent'] = self._contentstack_user_agent()
+        self._local_headers['Content-Type'] = 'application/json'
         self.url_path = config.Config().get_endpoint(self.url_path)
         if 'environment' in self._local_headers:
             self._query_prams['environment'] = self._local_headers['environment']
 
-    def http_request(self) -> dict:
-        self._local_headers['X-User-Agent'] = self._contentstack_user_agent()
-        self._local_headers['Content-Type'] = 'application/json'
+    def http_request(self) -> tuple:
         response = requests.get(self.url_path, params=self._query_prams, headers=self._local_headers)
-
-        print('request url:: ', response.url)
         if response.ok:
-            json_response = response.json()
-            if 'stack' in json_response:
-                logging.info('stack response')
-                return json_response['stack']
-            if 'content_types' in json_response:
-                logging.info('contenttypes response')
-                return json_response['content_types']
-            if 'items' in json_response:
-                logging.info('sync response')
-                return json_response['items']
-            if 'content_type' in json_response:
-                logging.info('content type response')
-                return json_response['content_type']
-            if 'entry' in json_response:
-                logging.info('entry response')
-                return json_response['entry']
-            if 'entries' in json_response:
-                logging.info('entries response')
-                return json_response['entries']
-
+            self.result = response.json()
         else:
-            error_response = response.json()
-            # error_message = error_response["error_message"]
-            # error_code = error_response["error_code"]
-            # error_code = error_response["errors"]
-            return error_response
+            self.error = response.json()
+
+        return self.result, self.error
 
     @staticmethod
     def _contentstack_user_agent() -> str:
         """
         X-Contentstack-User-Agent header.
         """
-        header = {}
-        from . import __version__
-        header['sdk'] = {
+        header = {'sdk': {
             'name': 'contentstack.python',
-            'version': __version__
-        }
-
+            'version': "1.0.0"
+        }}
+        # from contentstack import __version__
         # from sys import platform as cs_plateforom
         # os_name = cs_plateforom.system()
         # if os_name == 'Darwin':
@@ -86,4 +63,18 @@ def set_query_model(self):
         pass
 
     def set_asset_model(self):
+        pass
+
+    def request_api(self, urls: str):
+        try:
+            r = requests.get(urls, timeout=3)
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as errh:
+            print("Http Error:", errh)
+        except requests.exceptions.ConnectionError as errc:
+            print("Error Connecting:", errc)
+        except requests.exceptions.Timeout as errt:
+            print("Timeout Error:", errt)
+        except requests.exceptions.RequestException as err:
+            print("OOps: Something Else", err)
         pass