Improve error reporting

Author: avillar

ogc/bblocks/models.py

@@ -451,7 +451,7 @@ def __init__(self,
                 self.bblock_paths[bblock.files_path] = bblock
             except Exception as e:
                 if fail_on_error:
-                    raise
+                    raise Exception(f'Error encountered while loading bblock: {bblock_id}') from e
                 print('==== Exception encountered while processing', bblock_id, '====', file=sys.stderr)
                 import traceback
                 traceback.print_exception(e, file=sys.stderr)

ogc/bblocks/postprocess.py

@@ -286,7 +286,7 @@ def do_postprocess(bblock: BuildingBlock, light: bool = False) -> bool:
                             print(f"  - {annotated}", file=sys.stderr)
                     except Exception as e:
                         if fail_on_error:
-                            raise
+                            raise Exception(f"Error annotating schema for {building_block.identifier}") from e
                         traceback.print_exception(e, file=sys.stderr)
                         if isinstance(e, ContextLoadError):
                             if e.__cause__:
@@ -328,8 +328,8 @@ def do_postprocess(bblock: BuildingBlock, light: bool = False) -> bool:
                         building_block.metadata['ontology'] = building_block.ontology.value
                 except Exception as e:
                     if fail_on_error:
-                        raise BuildingBlockError(f'Error processing ontology for {building_block.identifier}')\
-                            from e
+                        raise BuildingBlockError(f'Error processing ontology '
+                                                 f'for {building_block.identifier}') from e
                     print("Exception when processing ontology for", building_block.identifier, file=sys.stderr)
                     traceback.print_exception(e, file=sys.stderr)
 
@@ -338,6 +338,9 @@ def do_postprocess(bblock: BuildingBlock, light: bool = False) -> bool:
                     base_url + os.path.relpath(building_block.remote_cache_dir.resolve(), cwd) + '/'
             )
 
+        if isinstance(building_block.metadata.get('schema'), str):
+            building_block.metadata['schema'] = {'application/yaml': building_block.metadata['schema']}
+
         child_bblocks.append(building_block)
 
     if not steps or 'jsonld' in steps:
@@ -366,7 +369,7 @@ def do_postprocess(bblock: BuildingBlock, light: bool = False) -> bool:
                         print(f"  - {os.path.relpath(written_context)}", file=sys.stderr)
                 except Exception as e:
                     if fail_on_error:
-                        raise e
+                        raise Exception(f'Error writing context for {building_block.identifier}') from e
                     print(f"[Error] Writing context for {building_block.identifier}: {type(e).__name__}: {e}")
 
     output_bblocks = []