asset oder - asc/desc added

Author: ishaileshmishra

contentstack/__init__.py

@@ -6,8 +6,6 @@
 __package__ = 'contentstack'
 __endpoint__ = 'cdn.contentstack.io'
 
-# from .stack import Stack
-# from .stack import Stack
 from .entry import Entry
 from .asset import Asset
 from .asset_library import AssetLibrary
@@ -16,7 +14,6 @@
 from .errors import Error, ConfigError
 from .http_connection import HTTPConnection
 
-
 # Set a default logger to prevent "No handler found" warnings
 import logging
 try:

contentstack/asset_library.py

@@ -24,6 +24,17 @@
  """
 
 
+class OrderType(object):
+
+    """
+    OrderType is used to choose one of the ascending and descending
+    It returns either ascending or descending
+    """
+    ASC, DESC = range(0, 2)
+
+    pass
+
+
 class AssetLibrary:
 
     """
@@ -35,23 +46,27 @@ class AssetLibrary:
     """
 
     def __init__(self):
-        self.count = 0
+
+        self.__count = 0
         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.__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.__stack_headers = headers
             if 'environment' in self.__stack_headers:
@@ -60,6 +75,7 @@ def headers(self, headers: dict):
         return self
 
     def remove_header(self, key):
+
         if key is not None:
             if key in self.__stack_headers:
                 self.__stack_headers.pop(key)
@@ -74,79 +90,31 @@ def include_relative_url(self):
         return self
 
     def get_count(self) -> int:
-        return self.count
-
-    # Color = enumerate(RED="ASCENDING", GREEN='DESCENDING')
-    # [PENDING], Need to add
-    # order_by = Enum('ORDER_BY', 'ASCENDING DESCENDING')
-    #   def sort(self, key: str, order_by):
-    #  if ORDER_.ASCENDING:
-    #      self.__post_params['asc'] = key
-    #   if ORDER_BY.DESCENDING:
-    #       self.__post_params['desc'] = key
-    #   return self.__post_params
-
-    def fetch_all(self):
-
-        import requests
-        from urllib import parse
-        from requests import Response
-        from contentstack import Config
-        from contentstack import Error
-        from contentstack import Asset
-
-        error = None
-        asset_url = Config().endpoint('assets')
-        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.__stack_headers)
-            list_asset: list[Asset] = []
-
-            if response.ok:
-
-                response: dict = response.json()['assets']
-
-                for asset in response:
-                    asset_instance = Asset()
-                    asset_resp: Asset = asset_instance.configure(response=asset)
-                    list_asset.append(asset_resp)
-
-                return list_asset
-            else:
-                error_dict = response.json()
-                return Error().error(error_dict)
-
-        except requests.exceptions.RequestException as e:
-            raise ConnectionError(e.response)
-
-
-    @classmethod
-    def header_agents(cls) -> dict:
+        """
+        get_count returns the total size of content
+        :return: count of content
+        :rtype: int
+        """
+        return self.__count
 
-        import contentstack
-        import platform
+    def sort(self, key: str, order_by: OrderType):
 
         """
-        Contentstack-User-Agent header.
+        :param key: provides key on which ASC/DESC need to apply.
+        :param order_by: object option either "asc" or "desc"
+        :return self , instance of AssetLibrary
         """
-        header = {'sdk': dict(name=contentstack.__package__, version=contentstack.__version__)}
-        os_name = platform.system()
+        if order_by == 1:
+            self.__query_params['asc'] = key
+        else:
+            self.__query_params['desc'] = key
 
-        if os_name == 'Darwin':
-            os_name = 'macOS'
+        return self.__query_params
 
-        elif not os_name or os_name == 'Java':
-            os_name = None
+    def fetch_all(self):
+        from contentstack import Config
+        asset_url = Config().endpoint('assets')
+        return self.__http_request.get_result(asset_url, self.__query_params, self.__stack_headers)
 
-        elif os_name and os_name not in ['macOS', 'Windows']:
-            os_name = 'Linux'
 
-        header['os'] = {
-            'name': os_name,
-            'version': platform.release()
-        }
 
-        local_headers = {'X-User-Agent': str(header), "Content-Type": 'application/json'}
-        return local_headers

contentstack/utils.py

@@ -75,3 +75,7 @@ def header_agents() -> dict:
 
     local_headers = {'X-User-Agent': header, "Content-Type": 'application/json'}
     return local_headers
+
+
+
+

setup.py

@@ -1,13 +1,16 @@
 # !/usr/bin/env python
 # distutils/setuptools install script.
 
-from setuptools import setup, find_packages
+import setuptools
 import os
 import re
 
 ROOT = os.path.dirname(__file__)
 VERSION_RE = re.compile(r'''__version__ = ['"]([0-9.]+)['"]''')
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
 
 def get_version():
     init = open(os.path.join(ROOT, 'contentstack', '__init__.py')).read()
@@ -26,12 +29,13 @@ def read(fname):
     'python-dateutil'
 ]
 
-setup(
+setuptools.setup(
 
     name='contentstack',
     version=get_version(),
     py_modules=['contentstack'],
-    packages=find_packages(exclude=['tests']),
+    scripts=['dokr'],
+    # packages=find_packages(exclude=['tests']),
     url='https://github.com/contentstack/contentstack-python.git',
     license='MIT License',
     author='Shailesh Mishra',
@@ -40,7 +44,7 @@ def read(fname):
                 'Contentstack. The SDK uses Content Delivery APIs. ',
     install_requires=['requests', 'asset'],
     tests_require=['pytest'],
-    long_description=read('README.rst'),
+    long_description=read('README.md'),
     include_package_data=True,
 
     classifiers=[