Feat/cs 44495 added reference support (#24)

* Next (#22)

* Fixed snyk issues and added auto publish package support in github action. (#18)

* Fixed snyk issues and added auto publish package support in github ac… (#20)

* Fixed snyk issues and added auto publish package support in github action.

* Added security file and updated license

* Updated changelog file message

* Updated python version in github action file

* Updated pip and pylint

* Feat/cs 44004 json rte nested list fragment (#21)

* Fixed snyk issues and added auto publish package support in github ac… (#19)

* Fixed snyk issues and added auto publish package support in github action. (#18)

* Fixed snyk issues and added auto publish package support in github ac… (#20)

* Fixed snyk issues and added auto publish package support in github action.

* Added security file and updated license

* Updated changelog file message

* Updated python version in github action file

* Updated pip and pylint

* Added fragment style attribute in JSON RTE nested list

Updated License file.

* Fix/cs 44004 changed host name (#23)

* Added fragment style attribute in JSON RTE nested list

Updated License file.

* Changed dev url to prod url

* Added reference support and fixed package build issues

Author: sunil-lakshman

changelog.rst

@@ -1,6 +1,14 @@
 ================
 **CHANGELOG**
 ================
+
+*v1.3.0*
+============
+
+NEW FEATURE: Added Reference attribute.
+
+- added node attribute Reference
+
 *v1.2.3*
 ============
 

contentstack_utils/__init__.py

@@ -11,12 +11,26 @@
 from contentstack_utils.embedded.item_type import ItemType
 from contentstack_utils.embedded.styletype import StyleType
 from contentstack_utils.helper.metadata import Metadata
+from contentstack_utils.helper.node_to_html import NodeToHtml
 from contentstack_utils.render.options import Options
 from contentstack_utils.utils import Utils
+from contentstack_utils.gql import GQL
+from contentstack_utils.automate import Automate
+
+__all__ = (
+"Utils",
+"Options",
+"Metadata",
+"GQL",
+"Automate",
+"StyleType",
+"ItemType",
+"NodeToHtml"
+)
 
 __title__ = 'contentstack_utils'
 __author__ = 'contentstack'
 __status__ = 'debug'
-__version__ = '1.1.0'
+__version__ = '1.3.0'
 __endpoint__ = 'cdn.contentstack.io'
 __contact__ = 'support@contentstack.com'

contentstack_utils/automate.py

@@ -1,5 +1,4 @@
 import json
-
 from contentstack_utils.helper.converter import convert_style
 from contentstack_utils.helper.metadata import Metadata
 from contentstack_utils.helper.node_to_html import NodeToHtml
@@ -22,6 +21,12 @@ def _str_from_embed_items(metadata, entry, option):
                 content = Automate._find_embedded_entry(items_array, metadata)
                 if content is not None:
                     return option.render_options(content, metadata)
+        else:
+            node_style = entry['type']
+            def call(children):
+                    return Automate._raw_processing(children, entry, option)
+            
+            return option.render_node(node_style, entry, callback=call)
         return ''
 
     @staticmethod
@@ -67,9 +72,8 @@ def is_json(self: object) -> bool:
             return False
 
     @staticmethod
-    def find_embed_keys(entry, path, option: Options, render_callback):
-        keys = path.split('.')
-        Automate.get_content(keys, entry, option, render_callback)
+    def find_embed_keys(entry, paths, option: Options, render_callback):
+        Automate.get_content(paths, entry, option, render_callback)
 
     @staticmethod
     def get_content(keys_array, entry, option: Options, render_callback):
@@ -98,9 +102,17 @@ def _enumerate_content(content, entry, option):
                     array_content.append(result)
                 return array_content
             if isinstance(content, dict):
-                if 'type' and 'children' in content:
-                    if content['type'] == 'doc':
-                        return Automate._raw_processing(content['children'], entry, option)
+                content_entry = content[entry]
+                if isinstance(content_entry, dict):
+                    if 'type' and 'children' in content_entry:
+                        if content_entry['type']:
+                            return Automate._raw_processing(content_entry['children'], entry, option)
+                elif isinstance(content_entry, list):
+                    for entry_item in content_entry:
+                        if 'type' and 'children' in entry_item:
+                            if entry_item['type']:
+                                return Automate._raw_processing(entry_item['children'], entry, option)
+
         return ''
 
     @staticmethod
@@ -121,7 +133,7 @@ def _extract_keys(item, entry, option: Options):
             node_style = item['type']
             if node_style == 'reference':
                 metadata = Automate._return_metadata(item, node_style)
-                return Automate._str_from_embed_items(metadata=metadata, entry=entry, option=option)
+                return Automate._str_from_embed_items(metadata=metadata, entry=item, option=option)
             else:
                 def call(children):
                     return Automate._raw_processing(children, entry, option)

contentstack_utils/embedded/__init__.py

@@ -0,0 +1 @@
+import contentstack_utils

contentstack_utils/gql.py

@@ -12,6 +12,7 @@ def json_to_html(gql_entry: dict, paths: list, option: Options):
         if len(paths) > 0:
             for path in paths:
                 Automate.find_embed_keys(gql_entry, path, option, render_callback=GQL._json_matcher)
+                return Automate._enumerate_content(gql_entry, path, option)
 
     @staticmethod
     def __filter_content(content_dict):

contentstack_utils/helper/__init__.py

@@ -0,0 +1 @@
+import contentstack_utils

contentstack_utils/render/__init__.py

@@ -0,0 +1 @@
+import contentstack_utils

contentstack_utils/render/options.py

@@ -115,7 +115,12 @@ def render_node(node_type, node_obj: dict, callback):
             return "<code>" + inner_html + "</code>"
         if node_type == 'fragment':
             return "<fragment>" + inner_html + "</fragment>"
-        if node_type in ['doc', 'reference']:
+        if node_type == 'reference':
+            if node_obj['attrs']['type'] == 'asset':
+                return "<img src=\"{}\" alt=\"{}\" class=\"{}\"  />{}".format(node_obj["attrs"]["asset-link"], node_obj["attrs"]["alt"], node_obj["attrs"]["class-name"], inner_html)
+            else:
+                return inner_html
+        if node_type == 'doc':
             return inner_html
         else:
             return inner_html

contentstack_utils/utils.py

@@ -87,7 +87,8 @@ def json_to_html(entry_obj, key_path: list, option: Options):
             for entry in entry_obj:
                 return Utils.json_to_html(entry, key_path, option)
         if isinstance(entry_obj, dict):
-            render_callback = Automate._enumerate_content
             if key_path is not None:
                 for path in key_path:
-                    Automate._find_embed_keys(entry_obj, path, option, render_callback)
+                    render_callback = Automate._enumerate_content(entry_obj, path, option)
+                    # Automate._find_embed_keys(entry_obj, path, option, render_callback) This method used in GQL class.
+            return render_callback

setup.py

@@ -1,21 +1,21 @@
 import os
 
-from setuptools import find_packages
+from setuptools import setup, find_packages
 from distutils.core import setup
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
     long_description = readme.read()
 
 setup(
     name='contentstack_utils',
-    packages=find_packages(include=['contentstack']),
+    packages=find_packages(),
     description="contentstack_utils is a Utility package for Contentstack headless CMS with an API-first approach.",
     author='contentstack',
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/contentstack/contentstack-utils-python",
     license='MIT',
-    version='1.2.3',
+    version='1.3.0',
     install_requires=[
 
     ],