Standardize error messages

Makefile

@@ -1,5 +1,5 @@
 .DEFAULT_GOAL := test
 
 test:
-	pylint tap_shopify -d missing-docstring
+	pylint tap_shopify -d missing-docstring,too-many-branches
 	nosetests tests/unittests

tap_shopify/__init__.py

@@ -12,6 +12,7 @@
 from singer import metadata
 from singer import Transformer
 from tap_shopify.context import Context
+from tap_shopify.exceptions import ShopifyError
 import tap_shopify.streams # Load stream objects into Context
 
 REQUIRED_CONFIG_KEYS = ["shop", "api_key"]
@@ -140,15 +141,32 @@ def sync():
         Context.state['bookmarks']['currently_sync_stream'] = stream_id
 
         with Transformer() as transformer:
-            for rec in stream.sync():
-                extraction_time = singer.utils.now()
-                record_schema = catalog_entry['schema']
-                record_metadata = metadata.to_map(catalog_entry['metadata'])
-                rec = transformer.transform(rec, record_schema, record_metadata)
-                singer.write_record(stream_id,
-                                    rec,
-                                    time_extracted=extraction_time)
-                Context.counts[stream_id] += 1
+            try:
+                for rec in stream.sync():
+                    extraction_time = singer.utils.now()
+                    record_schema = catalog_entry['schema']
+                    record_metadata = metadata.to_map(catalog_entry['metadata'])
+                    rec = transformer.transform(rec, record_schema, record_metadata)
+                    singer.write_record(stream_id,
+                                        rec,
+                                        time_extracted=extraction_time)
+                    Context.counts[stream_id] += 1
+            except pyactiveresource.connection.ResourceNotFound as exc:
+                raise ShopifyError(exc, 'Ensure shop is entered correctly') from exc
+            except pyactiveresource.connection.UnauthorizedAccess as exc:
+                raise ShopifyError(exc, 'Invalid access token - Re-authorize the connection') \
+                    from exc
+            except pyactiveresource.connection.ConnectionError as exc:
+                msg = ''
+                try:
+                    body_json = exc.response.body.decode()
+                    body = json.loads(body_json)
+                    msg = body.get('errors')
+                finally:
+                    raise ShopifyError(exc, msg) from exc
+            except Exception as exc:
+                raise ShopifyError(exc) from exc
+
 
         Context.state['bookmarks'].pop('currently_sync_stream')
         singer.write_state(Context.state)
@@ -158,27 +176,30 @@ def sync():
         LOGGER.info('%s: %d', stream_id, stream_count)
     LOGGER.info('----------------------')
 
-@utils.handle_top_exception(LOGGER)
 def main():
-
-    # Parse command line arguments
-    args = utils.parse_args(REQUIRED_CONFIG_KEYS)
-
-    # If discover flag was passed, run discovery mode and dump output to stdout
-    if args.discover:
-        catalog = discover()
-        print(json.dumps(catalog, indent=2))
-    # Otherwise run in sync mode
-    else:
-        Context.tap_start = utils.now()
-        if args.catalog:
-            Context.catalog = args.catalog.to_dict()
+    try:
+        # Parse command line arguments
+        args = utils.parse_args(REQUIRED_CONFIG_KEYS)
+
+        # If discover flag was passed, run discovery mode and dump output to stdout
+        if args.discover:
+            catalog = discover()
+            print(json.dumps(catalog, indent=2))
+        # Otherwise run in sync mode
         else:
-            Context.catalog = discover()
-
-        Context.config = args.config
-        Context.state = args.state
-        sync()
+            Context.tap_start = utils.now()
+            if args.catalog:
+                Context.catalog = args.catalog.to_dict()
+            else:
+                Context.catalog = discover()
+
+            Context.config = args.config
+            Context.state = args.state
+            sync()
+    except Exception as exc:
+        for line in str(exc).splitlines():
+            LOGGER.critical(line)
+        raise exc
 
 if __name__ == "__main__":
     main()

tap_shopify/exceptions.py

@@ -0,0 +1,3 @@
+class ShopifyError(Exception):
+    def __init__(self, error, msg=''):
+        super().__init__('{}\n{}'.format(error.__class__.__name__, msg))