passing stack instance to asset, content_type, entry, query

Author: ishaileshmishra

contentstack/__init__.py

@@ -6,6 +6,7 @@
 __package__ = 'contentstack'
 __endpoint__ = 'cdn.contentstack.io'
 
+# from .stack import Stack
 # from .stack import Stack
 from .entry import Entry
 from .asset import Asset
@@ -26,6 +27,3 @@ def emit(self, record):
             pass
 
 logging.getLogger(__name__).addHandler(NullHandler())
-
-
-

contentstack/asset_library.py

@@ -36,26 +36,33 @@ class AssetLibrary:
 
     def __init__(self):
         self.count = 0
-        self.__local_headers = {}
+        self.__stack_instance = None
+        self.__http_request = None
+        self.__stack_headers = {}
         self.__query_params = {}
 
+    def instance(self, stack_instance):
+        self.__stack_instance = stack_instance
+        self.__stack_headers.update(self.__stack_instance.headers)
+        self.__http_request = self.__stack_instance.http_request
+
     def set_header(self, key: str, value):
         if key is not None and value is not None:
-            self.__local_headers[key] = value
+            self.__stack_headers[key] = value
             return self
 
     def headers(self, headers: dict):
         if headers is not None and len(headers) > 0 and isinstance(headers, dict):
-            self.__local_headers = headers
-            if 'environment' in self.__local_headers:
-                env_value = self.__local_headers['environment']
+            self.__stack_headers = headers
+            if 'environment' in self.__stack_headers:
+                env_value = self.__stack_headers['environment']
                 self.__query_params["environment"] = env_value
         return self
 
     def remove_header(self, key):
         if key is not None:
-            if key in self.__local_headers:
-                self.__local_headers.pop(key)
+            if key in self.__stack_headers:
+                self.__stack_headers.pop(key)
         return self
 
     def include_count(self):
@@ -79,7 +86,7 @@ def get_count(self) -> int:
     #       self.__post_params['desc'] = key
     #   return self.__post_params
 
-    def fetch_all(self) -> tuple:
+    def fetch_all(self):
 
         import requests
         from urllib import parse
@@ -90,11 +97,11 @@ def fetch_all(self) -> tuple:
 
         error = None
         asset_url = Config().endpoint('assets')
-        self.__local_headers.update(self.header_agents())
+        self.__stack_headers.update(self.header_agents())
         payload = parse.urlencode(query=self.__query_params, encoding='UTF-8')
 
         try:
-            response: Response = requests.get(asset_url, params=payload, headers=self.__local_headers)
+            response: Response = requests.get(asset_url, params=payload, headers=self.__stack_headers)
             list_asset: list[Asset] = []
 
             if response.ok:
@@ -105,16 +112,15 @@ def fetch_all(self) -> tuple:
                     asset_instance = Asset()
                     asset_resp: Asset = asset_instance.configure(response=asset)
                     list_asset.append(asset_resp)
-            else:
 
+                return list_asset
+            else:
                 error_dict = response.json()
-                Error().error(error_dict)
-
-            return list_asset, error
+                return Error().error(error_dict)
 
         except requests.exceptions.RequestException as e:
             raise ConnectionError(e.response)
-            pass
+
 
     @classmethod
     def header_agents(cls) -> dict:

contentstack/config.py

@@ -67,7 +67,7 @@ def endpoint(self, path):
         url = self.path(path)
         if url is not None and isinstance(url, str):
             url = "{0}{1}/{2}/{3}".format(self.defaultConfig["protocol"], self.host(), self.version(), url)
-            logging.info('{0} endpoint'.format(path))
+            logging.info('endpoint is :: {0} '.format(url))
         return url
 
 

contentstack/errors.py

@@ -38,12 +38,15 @@ def __init__(self):
         self.__cause_err = str
 
     def config(self, result: dict):
+
         if result is not None and len(result) > 0:
             self.__error_dict = result
             self.__error_code = self.__error_dict['error_code']
             self.__msg = self.__error_dict['error_message']
             self.__cause_err = self.__error_dict['errors']
 
+        return self
+
     @property
     def error_code(self):
         """

contentstack/http_connection.py

@@ -1,4 +1,3 @@
-
 class HTTPConnection:
 
     def __init__(self, url: str, query: dict, headers: dict):
@@ -10,13 +9,13 @@ def __init__(self, url: str, query: dict, headers: dict):
         else:
             raise TypeError('Kindly provide valid Arguments')
 
-    def get_result(self, url: str, query: dict, headers: dict) -> tuple:
+    def get_result(self, url: str, query: dict, headers: dict):
 
         import requests
         from urllib import parse
         from requests import Response
         from contentstack.stack import SyncResult
-        from contentstack.errors import ContentstackError
+        from contentstack import Error
 
         if url is not None and len(url) > 0:
             self.url = url
@@ -27,7 +26,6 @@ def get_result(self, url: str, query: dict, headers: dict) -> tuple:
 
         # Adding user agent to headers
         self.headers.update(self.__user_agents())
-        # Encoding query to string
         payload = parse.urlencode(query=self.query, encoding='UTF-8')
 
         try:
@@ -78,12 +76,11 @@ def get_result(self, url: str, query: dict, headers: dict) -> tuple:
                 # Decode byte response to json
                 err = response.json()
                 if err is not None:
-                    error_code = err['error_code']
-                    error_message = err['error_message']
-                    raise ContentstackError('Server Error Code {} Message: {}'.format(error_code, error_message))
-                    # return Error().config(err)
+                    return Error().config(err)
+                    # raise ContentstackError('Server Error Code {} Message: {}'.format(error_code, error_message))
 
         except requests.RequestException as err:
+            # Error().config(err)
             raise ConnectionError(err)
 
     @staticmethod
@@ -126,7 +123,6 @@ def __user_agents() -> dict:
 
         """
         Contentstack-User-Agent.
-        
         """
         header = {'sdk': dict(name=contentstack.__package__, version=contentstack.__version__)}
         os_name = platform.system()

setup.py

@@ -30,12 +30,14 @@ def read(fname):
 
     name='contentstack',
     version=get_version(),
+    py_modules=['contentstack'],
     packages=find_packages(exclude=['tests']),
-    url='https://github.com/contentstack/contentstack-python',
+    url='https://github.com/contentstack/contentstack-python.git',
     license='MIT License',
     author='Shailesh Mishra',
-    author_email='shailesh.mishra@contentstack.com',
-    description='Create python-based applications and use the python SDK to fetch and deliver content from Contentstack. The SDK uses Content Delivery APIs. ',
+    author_email='mshaileshr@gmail.com',
+    description='Create python-based applications and use the python SDK to fetch and deliver content from '
+                'Contentstack. The SDK uses Content Delivery APIs. ',
     install_requires=['requests', 'asset'],
     tests_require=['pytest'],
     long_description=read('README.rst'),
@@ -46,12 +48,6 @@ def read(fname):
         "Operating System :: OS Independent",
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.1',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],