Merge pull request #279 from linkml/issue-1627

Issue 1627

Author: pkalita-lbl

linkml_runtime/utils/context_utils.py

@@ -66,11 +66,12 @@ def map_import(importmap: Dict[str, str], namespaces: Callable[[None], "Namespac
         # the importmap may contain mappings for prefixes
         prefix, lname = sname.split(':', 1)
         prefix += ':'
-        expanded_prefix = importmap.get(prefix, prefix)
-        if expanded_prefix.startswith("http"):
-            sname = expanded_prefix + lname
-        else:
-            sname = os.path.join(expanded_prefix, lname)
+        expanded_prefix = importmap.get(prefix)
+        if expanded_prefix is not None:
+            if expanded_prefix.startswith("http"):
+                sname = expanded_prefix + lname
+            else:
+                sname = os.path.join(expanded_prefix, lname)
     sname = importmap.get(sname, sname)  # Import map may use CURIE
     sname = str(namespaces().uri_for(sname)) if ':' in sname else sname
     return importmap.get(sname, sname)  # It may also use URI or other forms

tests/test_utils/test_schemaview.py

@@ -8,7 +8,7 @@
 
 from linkml_runtime.dumpers import yaml_dumper
 from linkml_runtime.linkml_model.meta import SchemaDefinition, ClassDefinition, SlotDefinitionName, SlotDefinition, \
-    ClassDefinitionName
+    ClassDefinitionName, Prefix
 from linkml_runtime.loaders.yaml_loader import YAMLLoader
 from linkml_runtime.utils.introspection import package_schemaview
 from linkml_runtime.utils.schemaview import SchemaView, SchemaUsage, OrderedBy
@@ -533,6 +533,41 @@ def test_metamodel_imports(self):
         self.assertGreater(len(sv.all_classes()), 20)
         self.assertCountEqual(all_classes, sv.all_classes())
 
+    def test_non_linkml_remote_import(self):
+        """
+        Test that a remote import _not_ using the linkml prefix works
+
+        See: https://github.com/linkml/linkml/issues/1627
+        """
+        schema = SchemaDefinition(
+            id='test_non_linkml_remote_import',
+            name='test_non_linkml_remote_import',
+            prefixes=[
+                Prefix(
+                    prefix_prefix="foo",
+                    prefix_reference="https://w3id.org/linkml/"
+                )
+            ],
+            imports=[
+                "foo:types"
+            ],
+            slots=[
+                SlotDefinition(
+                    name="an_int",
+                    range="integer"
+                )
+            ],
+            classes=[
+                ClassDefinition(
+                    name="AClass",
+                    slots=["an_int"]
+                )
+            ]
+        )
+        sv = SchemaView(schema)
+        slots = sv.class_induced_slots("AClass", imports=True)
+        self.assertEqual(len(slots), 1)
+
 
     def test_traversal(self):
         schema = SchemaDefinition(id='test', name='traversal-test')