Merge pull request #303 from linkml/linkml-issue-1942

Fixed CURIE validation to be conformant.
linkml · Feb 27, 2024 · 7c311d9 · 7c311d9
2 parents 5fa3115 + 27b9158
commit 7c311d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/linkml_runtime/utils/metamodelcore.py b/linkml_runtime/utils/metamodelcore.py
@@ -177,8 +177,6 @@ def ns_ln(cls, v: str) -> Optional[Tuple[str, str]]:
             if not NCName.is_valid(prefix):
                 return None
             reference = curie_split[1]
-            if not cls.term_name.match(reference):
-                return None
         return prefix, reference
 
     @classmethod

diff --git a/tests/test_utils/test_metamodelcore.py b/tests/test_utils/test_metamodelcore.py
@@ -66,12 +66,11 @@ def test_curie(self):
         self.assertTrue(Curie.is_valid(':type'))
         self.assertTrue(Curie.is_valid('WIKIDATA_PROPERTY:P854'))
         self.assertTrue(Curie.is_valid('WIKIDATA.PROPERTY:P854'))
+        self.assertTrue(Curie.is_valid('CL:0000001'))
         with self.assertRaises(ValueError):
             Curie("1df:type")
         self.assertFalse(Curie.is_valid('1df:type'))
-        with self.assertRaises(ValueError):
-            Curie("rdf:17")
-        self.assertFalse(Curie.is_valid('rdf:17'))
+        self.assertTrue(Curie.is_valid('rdf:17'))
         nsm = Namespaces(Graph())
         self.assertEqual(RDF.type, Curie("rdf:type").as_uri(nsm))
         self.assertIsNone(Curie("ex:foo").as_uri(nsm))