improving error handling in CLI; improving inferred ids of tables in multi.CSV, multi.TSV files

Author: jonrkarr

obj_tables/__main__.py

@@ -14,6 +14,7 @@
 import obj_tables
 import os
 import os.path
+import sys
 import types  # noqa: F401
 
 DEFAULT_WRITER_ARGS = {
@@ -313,7 +314,13 @@ def main():
             if os.getenv('DEBUG', '0').lower() in ['1', 'true']:
                 raise exception
             else:
-                raise SystemExit(str(exception))
+                if isinstance(exception, ValueError):
+                    raise SystemExit(str(exception))
+                else:
+                    _, _, traceback = sys.exc_info()
+                    raise SystemExit('ObjTables encountered an unexpected error: {}: {} at {}:{}'.format(
+                        exception.__class__.__name__, str(exception),
+                        traceback.tb_frame.f_code.co_filename, traceback.tb_frame.f_code.co_firstlineno))
 
 
 def get_schema_models(filename):

obj_tables/io.py

@@ -2236,6 +2236,7 @@ def run(self, path, schema_name=None, models=None,
 
         i_sheet = 0
         i_sheet_start = 0
+        i_sheet_class = {}
         last_sheet_metadata = None
 
         data = reader.read_worksheet('')
@@ -2247,6 +2248,7 @@ def run(self, path, schema_name=None, models=None,
                     data[0][0])
                 data.remove(data[0])
 
+        sheet_class = None
         sheet_id = None
         for i_row, row in enumerate(data):
             if row and isinstance(row[0], str):
@@ -2255,11 +2257,15 @@ def run(self, path, schema_name=None, models=None,
                     if i_sheet > 0:
                         self._write_model(data[i_sheet_start:i_row],
                                           last_sheet_metadata, tmp_dirname, sheet_id, ext)
+                    last_sheet_metadata = WorkbookReader.parse_worksheet_heading_metadata(
+                        row[0], sheet_name=str(i_sheet + 1))
+                    sheet_class = last_sheet_metadata.get('type', '') + '-' + last_sheet_metadata.get('class', '')
+                    if sheet_class not in i_sheet_class:
+                        i_sheet_class[sheet_class] = 0
+                    sheet_id = str(i_sheet_class[sheet_class] + 1)
+                    i_sheet_class[sheet_class] += 1
                     i_sheet += 1
                     i_sheet_start = i_row
-                    sheet_id = str(i_sheet + 1)
-                    last_sheet_metadata = WorkbookReader.parse_worksheet_heading_metadata(
-                        row[0], sheet_name=sheet_id)
                     if last_sheet_metadata.get('id', None):
                         sheet_id = last_sheet_metadata['id']
 

obj_tables/math/expression.py

@@ -579,7 +579,7 @@ def merge_attrs(self, other, other_objs_in_self, self_objs_in_other):
                 self._parsed_expression.related_objects[cls][obj_id] = other_objs_in_self.get(other_obj, other_obj)
 
 
-class ParsedExpressionError(Exception):
+class ParsedExpressionError(ValueError):
     """ Exception raised for errors in :obj:`ParsedExpression`
 
     Attributes: