Merge pull request #271 from linkml/schemaview-importmap

Ensure SchemaView uses importmap argument

Author: cmungall

linkml_runtime/utils/schemaview.py

@@ -131,14 +131,14 @@ class SchemaView(object):
     uuid: str = None
 
     def __init__(self, schema: Union[str, Path, SchemaDefinition],
-                 importmap: Optional[Mapping[str, str]] = None, merge_imports: bool = False):
+                 importmap: Optional[Dict[str, str]] = None, merge_imports: bool = False, base_dir: str = None):
         if isinstance(schema, Path):
             schema = str(schema)
         if isinstance(schema, str):
             schema = load_schema_wrap(schema)
         self.schema = schema
         self.schema_map = {schema.name: schema}
-        self.importmap = parse_import_map(importmap, self.base_dir) if self.importmap is not None else dict()
+        self.importmap = parse_import_map(importmap, base_dir) if importmap is not None else dict()
         if merge_imports:
             self.merge_imports()
         self.uuid = str(uuid.uuid4())

tests/test_utils/test_schemaview.py

@@ -353,6 +353,21 @@ def test_caching(self):
         view.add_class(ClassDefinition('W'))
         self.assertCountEqual(['Y', 'Z', 'W'], view.all_classes())
 
+    def test_import_map(self):
+        """
+        Path to import file should be configurable
+        """
+        for im in [{"core": "/no/such/file"}, {"linkml:": "/no/such/file"}]:
+            with self.assertRaises(FileNotFoundError):
+                view = SchemaView(SCHEMA_WITH_IMPORTS, importmap=im)
+                view.all_classes()
+        for im in [None, {}, {"core": "core"}]:
+            view = SchemaView(SCHEMA_WITH_IMPORTS, importmap=im)
+            view.all_classes()
+            self.assertCountEqual(['kitchen_sink', 'core', 'linkml:types'], view.imports_closure())
+            self.assertIn(ACTIVITY, view.all_classes())
+            self.assertNotIn(ACTIVITY, view.all_classes(imports=False))
+
     def test_imports(self):
         """
         view should by default dynamically include imports chain