refactored naming policy into uri matcher

1 files changed, 4 insertions, 5 deletions

diff --git a/bsie/lib/pipeline.py b/bsie/lib/pipeline.py
index 30fd6fd..98d9cc8 100644
--- a/bsie/lib/pipeline.py
+++ b/bsie/lib/pipeline.py
@@ -6,8 +6,9 @@ import typing
 
 # bsie imports
 from bsie.extractor import Extractor
+from bsie.matcher import nodes
 from bsie.reader import Reader
-from bsie.utils import bsfs, errors, node, ns
+from bsie.utils import bsfs, errors, ns
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -85,7 +86,7 @@ class Pipeline():
             self,
             path: bsfs.URI,
             principals: typing.Optional[typing.Iterable[bsfs.schema.Predicate]] = None,
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         """Extract triples from the file at *path*. Optionally, limit triples to *principals*."""
         # get principals
         principals = set(principals) if principals is not None else set(self.schema.predicates())
@@ -104,9 +105,7 @@ class Pipeline():
             rdr2ext[rdr].add(ext)
 
         # create subject for file
-        subject = node.Node(ns.bsn.Entity,
-            ucid=bsfs.uuid.UCID.from_path(path),
-            )
+        subject = nodes.Entity(ucid=bsfs.uuid.UCID.from_path(path))
 
         # extract information
         for rdr, extrs in rdr2ext.items():