Skip to content

Commit b04b0e3

Browse files
committed
Do not attempt to use expanded prefix if it is not found in importmap
1 parent 67fe2e1 commit b04b0e3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

linkml_runtime/utils/context_utils.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,12 @@ def map_import(importmap: Dict[str, str], namespaces: Callable[[None], "Namespac
6666
# the importmap may contain mappings for prefixes
6767
prefix, lname = sname.split(':', 1)
6868
prefix += ':'
69-
expanded_prefix = importmap.get(prefix, prefix)
70-
if expanded_prefix.startswith("http"):
71-
sname = expanded_prefix + lname
72-
else:
73-
sname = os.path.join(expanded_prefix, lname)
69+
expanded_prefix = importmap.get(prefix)
70+
if expanded_prefix is not None:
71+
if expanded_prefix.startswith("http"):
72+
sname = expanded_prefix + lname
73+
else:
74+
sname = os.path.join(expanded_prefix, lname)
7475
sname = importmap.get(sname, sname) # Import map may use CURIE
7576
sname = str(namespaces().uri_for(sname)) if ':' in sname else sname
7677
return importmap.get(sname, sname) # It may also use URI or other forms

tests/test_utils/test_schemaview.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def test_non_linkml_remote_import(self):
545545
prefixes=[
546546
Prefix(
547547
prefix_prefix="foo",
548-
prefix_reference="https://w3id.org/linkml"
548+
prefix_reference="https://w3id.org/linkml/"
549549
)
550550
],
551551
imports=[

0 commit comments

Comments
 (0)