prohibit certain characters in URI and ensure URIs in bsfs.graph

1 files changed, 2 insertions, 8 deletions

diff --git a/bsfs/triple_store/sparql/sparql.py b/bsfs/triple_store/sparql/sparql.py
index bd98f46..68c0027 100644
--- a/bsfs/triple_store/sparql/sparql.py
+++ b/bsfs/triple_store/sparql/sparql.py
@@ -284,10 +284,7 @@ class SparqlStore(base.TripleStoreBase):
             raise errors.ConsistencyError(f'{node_type} is not defined in the schema')
         # check and create guids
         for guid in guids:
-            # check convert to rdflib.URIRef
-            if not rdflib.term._is_valid_uri(guid): # pylint: disable=protected-access
-                raise ValueError(guids)
-            subject = rdflib.URIRef(guid)
+            subject = rdflib.URIRef(URI(guid))
             # check node existence
             if (subject, rdflib.RDF.type, None) in self._graph:
                 # FIXME: node exists and may have a different type! ignore? raise? report?
@@ -326,10 +323,7 @@ class SparqlStore(base.TripleStoreBase):
                 raise errors.InstanceError(inconsistent)
         # check guids
         # FIXME: Fail or skip inexistent nodes?
-        guids = set(guids)
-        invalid = {guid for guid in guids if not rdflib.term._is_valid_uri(guid)} # pylint: disable=protected-access
-        if len(invalid) > 0:
-            raise ValueError(invalid)
+        guids = {URI(guid) for guid in guids}
         inconsistent = {guid for guid in guids if not self._has_type(guid, node_type)}
         if len(inconsistent) > 0:
             raise errors.InstanceError(inconsistent)