refactored naming policy into uri matcher

1 files changed, 5 insertions, 4 deletions

diff --git a/bsie/extractor/image/face/detect.py b/bsie/extractor/image/face/detect.py
index 94e3a61..51d5659 100644
--- a/bsie/extractor/image/face/detect.py
+++ b/bsie/extractor/image/face/detect.py
@@ -7,7 +7,8 @@ import torch
 from facenet_pytorch import MTCNN, InceptionResnetV1
 
 # bsie imports
-from bsie.utils import bsfs, node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # inner-module imports
 from ... import base
@@ -72,17 +73,17 @@ class FaceDetect(base.Extractor):
 
     def extract(
             self,
-            subject: node.Node,
+            subject: nodes.Entity,
             content: dict,
             principals: typing.Iterable[bsfs.schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         # check principals
         if self.schema.predicate(ns.bse.face) not in principals:
             # nothing to do; abort
             return
 
         for face in content:
-            fnode = node.Node(ns.bsn.Face, ucid=face['ucid'])
+            fnode = nodes.Face(ucid=face['ucid'])
             yield subject, ns.bse.face, fnode
             yield fnode, bsf.x, face['x']
             yield fnode, bsf.y, face['y']