Merge branch 'develop'HEADv0.23.03releasemain

1 files changed, 11 insertions, 10 deletions

diff --git a/bsie/lib/bsie.py b/bsie/lib/bsie.py
index e087fa9..b02e707 100644
--- a/bsie/lib/bsie.py
+++ b/bsie/lib/bsie.py
@@ -1,16 +1,14 @@
-"""
 
-Part of the bsie module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
-# imports
+# standard imports
 import typing
 
 # bsie imports
-from bsie.tools import Pipeline
 from bsie.utils import bsfs, node, ns
 
+# inner-module imports
+from .naming_policy import NamingPolicy
+from .pipeline import Pipeline
+
 # exports
 __all__: typing.Sequence[str] = (
     'BSIE',
@@ -39,15 +37,18 @@ class BSIE():
 
     def __init__(
             self,
-            # pipeline builder.
+            # pipeline.
             pipeline: Pipeline,
+            # naming policy
+            naming_policy: NamingPolicy,
             # principals to extract at most. None implies all available w.r.t. extractors.
             collect: typing.Optional[typing.Iterable[bsfs.URI]] = None,
             # principals to discard.
             discard: typing.Optional[typing.Iterable[bsfs.URI]] = None,
             ):
-        # store pipeline
+        # store pipeline and naming policy
         self._pipeline = pipeline
+        self._naming_policy = naming_policy
         # start off with available principals
         self._principals = {pred.uri for pred in self._pipeline.principals}
         # limit principals to specified ones by argument.
@@ -87,6 +88,6 @@ class BSIE():
         # predicate lookup
         principals = {self.schema.predicate(pred) for pred in principals}
         # invoke pipeline
-        yield from self._pipeline(path, principals)
+        yield from self._naming_policy(self._pipeline(path, principals))
 
 ## EOF ##