update tests, story api client

Author: Kevin Hannegan

presalytics/lib/exceptions.py

@@ -63,7 +63,11 @@ def __init__(self, message=None, status_code=None):
                 message = "Status Code: {0}".format(status_code)
         else:
             if status_code:
-                message = message + ".  Status Code: {0}".format(status_code)
+                try:
+                    message = message.decode('utf-8')
+                except Exception:
+                    pass
+                message = str(message) + ".  Status Code: {0}".format(status_code)
         super().__init__(message)
 
 

sub_packages/story/spec.py

@@ -9,7 +9,7 @@
 SPEC = {
         "update": True,
         "update_type": "patch",
-        "endpoint": "{0}/no_tags_spec".format(host),
+        "endpoint": "{0}/story/no_tags_spec".format(host),
         "package_name": "presalytics_story",
         "package_url": "https://github.com/presalytics/story-python-client.git",
         "readme_path": os.path.join(os.path.dirname(os.path.realpath(__file__)), "README.md"),

test/__init__.py

@@ -0,0 +1,7 @@
+from functools import lru_cache
+import presalytics
+
+@lru_cache(maxsize=None)
+def get_test_client():
+    client = presalytics.Client()
+    return client

test/files/config.py

@@ -7,6 +7,8 @@
 PRESALYTICS = {
     'USERNAME': os.environ['PRESALYTICS_USERNAME'],
     'PASSWORD': os.environ['PRESALYTICS_PASSWORD'],
+    'CLIENT_ID': os.environ.get('CLIENT_ID'),
+    'CLIENT_SECRET': os.environ.get('CLIENT_SECRET'),
     'HOSTS': {}
 }
 

test/star.pptx

@@ -6,6 +6,7 @@
 import presalytics
 import io
 import lxml
+from test import get_test_client
 if typing.TYPE_CHECKING:
     from presalytics.client.presalytics_story import Story, OoxmlDocument
     from presalytics.client.presalytics_ooxml_automation.models import ChartChartDataDTO, TableTableDataDTO
@@ -15,10 +16,8 @@ class TestComponents(unittest.TestCase):
     """
     Test module features thatr render stories to dashboards or other formats
     """
-    def setUp(self):
-        pass
 
-    def test_render_matplotlib_plot(self):
+    def test_render_matploytlib_plot(self):
         presalytics.autodiscover_paths.append('test/files')
         presalytics.COMPONENTS = presalytics.story.components.ComponentRegistry(autodiscover_paths=presalytics.autodiscover_paths)
         test_file = os.path.join(os.path.dirname(__file__), 'files', 'matplotlib-outline.yaml')
@@ -33,8 +32,7 @@ def test_xml_widget(self):
         story = presalytics.create_story_from_ooxml_file(tmp_filename)
         outline = presalytics.StoryOutline.load(story.outline)
         old_widget = outline.pages[0].widgets[0]
-        client = presalytics.Client()
-        childs = client.ooxml_automation.documents_childobjects_get_id(old_widget.data["document_ooxml_id"])
+        childs = get_test_client().ooxml_automation.documents_childobjects_get_id(old_widget.data["document_ooxml_id"])
         endpoint_map = presalytics.OoxmlEndpointMap.shape() 
         object_type = endpoint_map.get_object_type()
         info = next(x for x in childs if x.object_type == object_type)
@@ -67,7 +65,7 @@ def test_xml_widget(self):
 
         presalytics.COMPONENTS.register(widget)
         story.outline = outline.dump()
-        client.story.story_id_put(story.id, story)
+        get_test_client().story.story_id_put(story.id, story)
         html = presalytics.Revealer(outline).package_as_standalone().decode('utf-8')
         self.assertIsInstance(html, str)
         os.remove(tmp_filename)
@@ -89,8 +87,7 @@ def test_bytesio_upload(self):
         with open(test_file, 'rb') as f:
             _bytes = io.BytesIO(f.read())
 
-        client = presalytics.Client()
-        story = presalytics.story_post_file_bytes(client, _bytes, "testfile.pptx")
+        story = presalytics.story_post_file_bytes(get_test_client(), _bytes, "testfile.pptx")
         from presalytics.client.presalytics_story.models.story import Story
         self.assertIsInstance(story, Story)
 
@@ -123,11 +120,10 @@ def test_chart_update(self):
         document: "OoxmlDocument"
 
         test_file = os.path.join(os.path.dirname(__file__), "files", "bubblechart.pptx")
-        client = presalytics.Client()
-        story = client.story.story_post_file(file=[test_file])
-        story_detailed = client.story.story_id_get(story.id, include_relationships=True)
+        story = get_test_client().story.story_post_file(file=[test_file])
+        story_detailed = get_test_client().story.story_id_get(story.id, include_relationships=True)
         document = story_detailed.ooxml_documents[0]
-        object_tree = client.ooxml_automation.documents_childobjects_get_id(document.ooxml_automation_id)
+        object_tree = get_test_client().ooxml_automation.documents_childobjects_get_id(document.ooxml_automation_id)
         endpoint_map = presalytics.OoxmlEndpointMap.chart() 
         object_type = endpoint_map.get_object_type()
         chart_id = next(entity.entity_id for entity in object_tree if entity.object_type == object_type)
@@ -170,11 +166,10 @@ def test_table_update(self):
         dto: "TableTableDataDTO"
 
         test_file = os.path.join(os.path.dirname(__file__), "files", "table.pptx")
-        client = presalytics.Client()
-        story = client.story.story_post_file(file=[test_file])
-        story_detailed = client.story.story_id_get(story.id, include_relationships=True)
+        story = get_test_client().story.story_post_file(file=[test_file])
+        story_detailed = get_test_client().story.story_id_get(story.id, include_relationships=True)
         document = story_detailed.ooxml_documents[0]
-        object_tree = client.ooxml_automation.documents_childobjects_get_id(document.ooxml_automation_id)
+        object_tree = get_test_client().ooxml_automation.documents_childobjects_get_id(document.ooxml_automation_id)
         endpoint_map = presalytics.OoxmlEndpointMap.table() 
         object_type = endpoint_map.get_object_type()
         table_id = next(entity.entity_id for entity in object_tree if entity.object_type == object_type)