refactored naming policy into uri matcher

1 files changed, 7 insertions, 6 deletions

diff --git a/bsie/extractor/image/iptc.py b/bsie/extractor/image/iptc.py
index 195eff7..0c03539 100644
--- a/bsie/extractor/image/iptc.py
+++ b/bsie/extractor/image/iptc.py
@@ -3,7 +3,8 @@
 import typing
 
 # 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
@@ -41,10 +42,10 @@ class Iptc(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]]:
         for pred in principals:
             # find callback
             clbk = self._callmap.get(pred)
@@ -55,13 +56,13 @@ class Iptc(base.Extractor):
 
     def _keywords(
             self,
-            subject: node.Node,
+            subject: nodes.Entity,
             content: dict,
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         if 'Iptc.Application2.Keywords' not in content:
             return
         for keyword in content['Iptc.Application2.Keywords']:
-            tag = node.Node(ns.bsn.Tag, label=keyword)
+            tag = nodes.Tag(label=keyword)
             yield subject, self.schema.predicate(ns.bse.tag), tag
             yield tag, self.schema.predicate(ns.bst.label), keyword