add more robust token deserialization

Author: Kevin Hannegan

presalytics/client/api.py

@@ -275,8 +275,15 @@ def __init__(
             cache_tokens = presalytics.CONFIG.get("CACHE_TOKENS")
         self.token_util = presalytics.client.auth.TokenUtil(token_cache=cache_tokens)
         if token:
+            #  Assume if token is passed as string, then it's an access token
+            if isinstance(token, str):
+                self.token_util.token = {"access_token": token}
+            
+            # if token is a dictionary with an 'access_token_expire_time' key, it's previous been processed / deserialized
             if token.get('access_token_expire_time', None):
                 self.token_util.token = token
+
+            # if token has an 'expires_in' key, if has not been deserialized
             elif token.get('expires_in', None):
                 self.token_util.process_token(token)
             else:
@@ -395,6 +402,26 @@ def download_file(self, story_id, ooxml_automation_id, download_folder=None, fil
         with open(filepath, 'wb') as f:
             f.write(response.data)
 
+    def get_client_info(self):
+        """
+        Convenience method returning information about this client to pass to downstream objects, e.g.,
+        components and new client instances
+
+        Returns
+        ----------
+        A dictionary containing instances values:
+            - token: self.token_util.token
+            - client_id: self.client_id
+            - cache_tokens: self.token_util.token_cache
+            - delegate_login: self.delegate login
+        """
+        return {
+            "token": self.token_util.token,
+            "client_id": self.client_id,
+            "cache_tokens": self.token_util.token_cache,
+            "delegate_login": self._delegate_login
+        }
+
 class DocConverterApiClientWithAuth(presalytics.client.auth.AuthenticationMixIn, presalytics.client.presalytics_doc_converter.api_client.ApiClient):
     """
     Wraps `presalytics.client.presalytics_doc_converter.api_client.ApiClient` with 

presalytics/lib/templates/base.py

@@ -55,7 +55,7 @@ class JinjaTemplateBuilder(presalytics.story.components.PageTemplateBase):
     multiple widgets on a page, the following pattern can be used inside of templates to 
     increment through the widgets as the jinja2 rendering engine moves through the template:
         
-        {{ widgets[widget_index.next()].to_html().decode('utf-8') }}  // renders widget and increments widget_index
+        {{ widgets[widget_index.next()].to_html() }}  // renders widget and increments widget_index
 
     Please also note that if `<script>` tags are included in the template, they will be 
     stripped out downstream by a `presalytics.story.components.Renderer` for security

presalytics/lib/templates/html/title_with_single_widget.html

@@ -4,7 +4,7 @@
     <div class="flex-row">
         <div class="flex-column">
             <div class="item-container">
-                {{ widgets[widget_index.next()].to_html().decode('utf-8') }}
+                {{ widgets[widget_index.next()].to_html() }}
             </div>
         </div>
     </div>

presalytics/lib/widgets/matplotlib.py

@@ -189,7 +189,7 @@ def create_container(self, **kwargs):
             'style': 'max-height: none; max-width: none;'
         })
         empty_parent_div.append(frame)
-        return lxml.html.tostring(empty_parent_div)
+        return lxml.html.tostring(empty_parent_div).decode('utf-8')
 
 
     @classmethod

presalytics/lib/widgets/ooxml.py

@@ -328,7 +328,12 @@ def to_html(self, **kwargs):
         """
         Returns an html string that will render the object at the endpoint
         """
-        self.svg_html = self.create_container()
+        html = self.create_container()
+        try:
+            html = html.decode('utf-8')
+        except Exception:
+            pass
+        self.svg_html = html
         return self.svg_html
 
     def get_svg(self, id, timeout_iterator=0) -> str:

test/test_components.py

@@ -29,7 +29,8 @@ def test_xml_widget(self):
         test_file = os.path.join(os.path.dirname(__file__), "files", "star.pptx")
         tmp_filename = os.path.join(os.path.dirname(__file__), os.path.basename(test_file))
         shutil.copyfile(test_file, tmp_filename)
-        story = presalytics.create_story_from_ooxml_file(tmp_filename)
+        client_info = get_test_client().get_client_info()
+        story = presalytics.create_story_from_ooxml_file(tmp_filename, client_info=client_info)
         outline = presalytics.StoryOutline.load(story.outline)
         old_widget = outline.pages[0].widgets[0]
         childs = get_test_client().ooxml_automation.documents_childobjects_get_id(old_widget.data["document_ooxml_id"])