include_fallback added

Author: shaileshmishra

CHANGELOG.md

@@ -1,19 +1,44 @@
 # CHANGELOG
 
-Date: 10-Aug-2020 - include_reference issue fixed
+
+*v1.2.0*
+============
+
+_Date: 20-Oct-2020_
+
+ - include_fallback Support Added
+ - Timeout support included
+
+- Entry 
+   - added support for include_fallback.
+- Asset
+   - added support for include_fallback.
+- AssetQueryable
+   - added support for include_fallback.
+- Query
+   - added support for include_fallback.
+
+-----------------------------
+
+
+
 
 ## _v1.1.0_
 
+_Date: 10-Aug-2020 - include_reference issue fixed_
+
 EntryQueryable
 
 - updated include_reference function.
 
 -----------------------------
 
-Date: 17-Jun-2020 - initial release
+
 
 ## _v1.0.0_
 
+_Date: 17-Jun-2020 - initial release_
+
 Stack
 
 - Initialisation of stack has been modified
@@ -34,11 +59,10 @@ Query
 
 -----------------------------
 
-Date: 18-Nov-2019 - beta release
 
 ## _v0.1.0_
 
-November-18, 2019 -beta release
+_November-18, 2019 -beta release_
 
 Initial release for the contentstack-python-sdk for Content Delivery API
 

changelog.rst

@@ -1,39 +1,64 @@
-=========
-CHANGELOG
-=========
+================
+**CHANGELOG**
+================
+
+*v1.2.0*
+============
+
+**Date: 20-Oct-2020**
+
+ - include_fallback Support Added
+ - Timeout support included
+
+
+**Entry**
+ - Added support for include_fallback.
+**Asset**
+ - Added support for include_fallback.
+**AssetQuery**
+ - Added support for include_fallback.
+**Query**
+ - Added support for include_fallback.
+
+============
+
 
-Date: 10-Aug-2020 - include_reference issue fixed
 
 *v1.1.0*
 ============
 
-EntryQueryable
-    - updated include_reference function.
+**Date: 10-Aug-2020 :: include_reference issue fixed**
+
+**EntryQueryable**
+ - updated include_reference function.
 
 ============
 
-Date: 17-Jun-2020 - initial release
 
 *v1.0.0*
 ============
 
-Stack
+**Date: 17-Jun-2020 :: Initial Release**
+
+**Stack**
     - Initialization of the stack has been modified
     - External config support moved to stack initialization optional parameters
 
-Asset
+**Asset**
     - changes incorporated in Asset class.
 
-Entry
+**Entry**
     - changes incorporated in the entry class.
 
-Query
+**Query**
     - Changes incorporated in the Query class.
 
 -----------------------------
 
-Date: 18-Nov-2019 - beta release
 
 *v0.0.1*
 ============
+
+**Date: 18-Nov-2019 :: Beta Release**
+
 - Beta release for the contentstack-python SDK for Content Delivery API

contentstack/__init__.py

@@ -19,6 +19,6 @@
 __title__ = 'contentstack-python'
 __author__ = 'Contentstack'
 __status__ = 'debug'
-__version__ = '1.1.0'
+__version__ = '1.2.0'
 __endpoint__ = 'cdn.contentstack.io'
 __email__ = '[email protected]'

contentstack/assetquery.py

@@ -97,6 +97,22 @@ def relative_url(self):
         """
         self.__query_params["relative_urls"] = "true"
         return self
+    
+    def include_fallback(self):
+        r"""Include the fallback locale publish content, if specified locale content is not publish.
+
+        :return: AssetQuery, so we can chain the call
+
+        ----------------------------
+        Example::
+
+            >>> import contentstack
+            >>> stack = contentstack.Stack('api_key', 'delivery_token', 'environment')
+            >>> result = stack.asset_query().include_fallback().find()
+        ----------------------------
+        """
+        self.__query_params['include_fallback'] = "true"
+        return self
 
     def find(self):
         r"""This call fetches the list of all the assets of a particular stack.

contentstack/entryqueryable.py

@@ -73,7 +73,7 @@ def excepts(self, field_uid: str):
 
     def include_reference(self, field_uid):
         """
-        **Include Reference:**
+        **[Include Reference]:**
         When you fetch an entry of a content type that has a reference field,
         by default, the content of the referred entry is not fetched.
         It only fetches the UID of the referred entry, along with the content of
@@ -112,9 +112,7 @@ def include_content_type(self):
             >>> entry = content_type.entry('uid')
             >>> entry.include_content_type()
             >>> result = entry.fetch()
-
         -------------------------------
-
         [Example: for Query:]
 
             >>> import contentstack

contentstack/https_connection.py

@@ -10,9 +10,11 @@
 
 import requests
 from requests.exceptions import Timeout, HTTPError
-
 import contentstack
 
+# from requests.adapters import HTTPAdapter
+# from requests.packages.urllib3.util.retry import Retry
+
 
 def get_os_platform():
     """ returns client platform """
@@ -52,9 +54,19 @@ def get(self, url):
         We use requests.get method since we are sending a GET request.
         The four arguments we pass are url, verify(ssl), timeout, headers
         """
+        
+        # retry_strategy = Retry(
+        # total=3,
+        # status_forcelist=[429, 500, 502, 503, 504],
+        # method_whitelist=["GET"]
+        # )
+        # adapter = HTTPAdapter(max_retries=retry_strategy)
+        # http = requests.Session()
+        # http.mount("https://", adapter)
+            
         try:
             self.headers.update(user_agents())
-            response = requests.get(url, verify=True, headers=self.headers)
+            response = requests.get(url, verify=True, timeout=(10, 8), headers=self.headers)
             response.encoding = 'utf-8'
             return response.json()
         except Timeout:

contentstack/utility.py

@@ -63,7 +63,8 @@ def do_url_encode(params):
 
     @staticmethod
     def get_complete_url(base_url: str, params: dict):
-        """ creates complete url using base_url and their respective parameters
+        """
+        creates complete url using base_url and their respective parameters
         :param base_url:
         :param params:
         :return:

requirements.txt

@@ -1,72 +1,7 @@
-aenum==2.2.3
-alabaster==0.7.12
-astroid==2.4.1
-attrs==19.3.0
-Babel==2.8.0
-bleach==3.1.5
-certifi==2020.6.20
-chardet==3.0.4
-click==7.1.2
-coverage==5.2.1
-coverage-badge==1.0.1
-dnspython==2.0.0
 docutils==0.16
-dparse==0.5.1
-entrypoints==0.3
-enum34==1.1.10
-env==0.1.0
-eventlet==0.25.2
-greenlet==0.4.15
-html-testRunner==1.2.1
-idna==2.10
-imagesize==1.2.0
-importlib-metadata==0.23
-iniconfig==1.0.0
-isort==4.3.21
-itsdangerous==1.1.0
-Jinja2==3.0.0a1
-keyring==21.3.0
-lazy-object-proxy==1.4.3
-MarkupSafe==2.0.0a1
-mccabe==0.6.1
-monotonic==1.5
-more-itertools==7.2.0
-packaging==20.4
-pip-autoremove==0.9.1
-pipdeptree==1.0.0
-piplint==0.2.0
+keyring==21.4.0
 pkginfo==1.5.0.1
-pluggy==0.13.1
-py==1.9.0
-Pygments==2.6.1
-pylint==2.5.2
-pyparsing==3.0.0a2
-pytest==6.0.1
-pytest-cov==2.9.0
-pytz==2020.1
-PyYAML==5.3.1
-readme-renderer==24.0
 requests==2.24.0
-requests-toolbelt==0.9.1
-safety==1.9.0
-six==1.15.0
-snowballstemmer==2.0.0
-Sphinx==3.1.2
-sphinx-rtd-theme==0.4.3
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
-toml==0.10.1
-tqdm==4.38.0
-twine==3.1.1
-typed-ast==1.4.1
-urllib3==1.25.10
-virtualenv==16.7.9
-wcwidth==0.2.5
-webencodings==0.5.1
-Werkzeug==1.0.1
-wrapt==1.11.2
-zipp==3.1.0
+pip~=20.2.3
+py~=1.9.0
+setuptools~=50.3.0