feat: nicer errors, cleanup examples.

bonobo/examples/datasets/__main__.py

@@ -4,7 +4,7 @@ import bonobo
 from bonobo import examples
 from bonobo.examples.datasets.coffeeshops import get_graph as get_coffeeshops_graph
 from bonobo.examples.datasets.fablabs import get_graph as get_fablabs_graph
-from bonobo.examples.datasets.services import get_services, get_datasets_dir, get_minor_version
+from bonobo.examples import get_minor_version, get_datasets_dir, get_services
 
 graph_factories = {
     'coffeeshops': get_coffeeshops_graph,

bonobo/examples/datasets/coffeeshops.py

@@ -1,10 +1,12 @@
 """
 
 """
+import sys
+
 import bonobo
 from bonobo import examples
 from bonobo.contrib.opendatasoft import OpenDataSoftAPI as ODSReader
-from bonobo.examples.datasets.services import get_services
+from bonobo.examples import get_services
 
 
 def get_graph(graph=None, *, _limit=(), _print=()):
@@ -58,10 +60,4 @@ def get_graph(graph=None, *, _limit=(), _print=()):
 
 
 if __name__ == '__main__':
-    parser = examples.get_argument_parser()
-
-    with bonobo.parse_args(parser) as options:
-        bonobo.run(
-            get_graph(**examples.get_graph_options(options)),
-            services=get_services()
-        )
+    sys.exit(examples.run(get_graph, get_services))

bonobo/examples/datasets/fablabs.py

@@ -20,8 +20,7 @@ import sys
 import bonobo
 from bonobo import examples
 from bonobo.contrib.opendatasoft import OpenDataSoftAPI
-from bonobo.examples.datasets.services import get_services
-from bonobo.util.statistics import Timer
+from bonobo.examples import get_services
 
 try:
     import pycountry
@@ -65,23 +64,4 @@ def get_graph(graph=None, *, _limit=(), _print=()):
 
 
 if __name__ == '__main__':
-    parser = examples.get_argument_parser()
-
-    with bonobo.parse_args(parser) as options:
-        with Timer() as timer:
-            print(
-                'Options:', ' '.join(
-                    '{}={}'.format(k, v)
-                    for k, v in sorted(options.items())
-                )
-            )
-            retval = bonobo.run(
-                get_graph(**examples.get_graph_options(options)),
-                services=get_services(),
-                strategy=options['strategy'],
-            )
-        print('Execution time:', timer)
-        print('Return value:', retval)
-        print('XStatus:', retval.xstatus)
-        if retval.xstatus:
-            sys.exit(retval.xstatus)
+    sys.exit(examples.run(get_graph, get_services))

bonobo/examples/datasets/services.py

@@ -1,20 +0,0 @@
-import os
-
-import bonobo
-
-
-def get_minor_version():
-    return '.'.join(bonobo.__version__.split('.')[:2])
-
-
-def get_datasets_dir(*dirs):
-    home_dir = os.path.expanduser('~')
-    target_dir = os.path.join(
-        home_dir, '.cache/bonobo', get_minor_version(), *dirs
-    )
-    os.makedirs(target_dir, exist_ok=True)
-    return target_dir
-
-
-def get_services():
-    return {'fs': bonobo.open_fs(get_datasets_dir('datasets'))}