Merge branch 'mb/diogenes' into develop

1 files changed, 19 insertions, 17 deletions

diff --git a/bsie/extractor/base.py b/bsie/extractor/base.py
index 89183f9..f92d7cc 100644
--- a/bsie/extractor/base.py
+++ b/bsie/extractor/base.py
@@ -1,8 +1,4 @@
 """The Extractor classes transform content into triples.
-
-Part of the bsie module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
 """
 # standard imports
 import abc
@@ -28,26 +24,32 @@ SCHEMA_PREAMBLE = '''
     prefix schema: <http://schema.org/>
 
     # common bsfs prefixes
-    prefix bsfs: <http://bsfs.ai/schema/>
-    prefix bse: <http://bsfs.ai/schema/Entity#>
-    prefix bsp: <http://bsfs.ai/schema/Preview#>
+    prefix bsfs: <https://schema.bsfs.io/core/>
+    prefix bsl: <https://schema.bsfs.io/core/Literal/>
+    prefix bsa: <https://schema.bsfs.io/core/Literal/Array/>
+    prefix bsd: <https://schema.bsfs.io/core/distance#>
+
+    prefix bsie: <https://schema.bsfs.io/ie/>
+    prefix bsn: <https://schema.bsfs.io/ie/Node/>
+    prefix bse: <https://schema.bsfs.io/ie/Node/Entity#>
+    prefix bsp: <https://schema.bsfs.io/ie/Node/Preview#>
 
     # default definitions
-    bsfs:Array rdfs:subClassOf bsfs:Literal .
-    bsfs:Number rdfs:subClassOf bsfs:Literal .
-    bsfs:Time rdfs:subClassOf bsfs:Literal .
-    bsfs:Feature rdfs:subClassOf bsfs:Array ;
+    bsl:Array rdfs:subClassOf bsfs:Literal .
+    bsl:Number rdfs:subClassOf bsfs:Literal .
+    bsl:Time rdfs:subClassOf bsfs:Literal .
+    bsa:Feature rdfs:subClassOf bsl:Array ;
         bsfs:dimension "1"^^xsd:integer ;
-        bsfs:dtype bsfs:f16 ;
-        bsfs:distance bsfs:euclidean .
+        bsfs:dtype <https://schema.bsfs.io/core/dtype#f16> ;
+        bsfs:distance bsd:euclidean .
 
     # essential nodes
-    bsfs:Entity rdfs:subClassOf bsfs:Node .
-    bsfs:File rdfs:subClassOf bsfs:Entity .
+    bsn:Entity rdfs:subClassOf bsfs:Node .
 
     # common definitions
     xsd:string rdfs:subClassOf bsfs:Literal .
-    xsd:integer rdfs:subClassOf bsfs:Number .
+    xsd:integer rdfs:subClassOf bsl:Number .
+    xsd:float rdfs:subClassOf bsl:Number .
 
     '''
 
@@ -93,7 +95,7 @@ class Extractor(abc.ABC):
     @property
     def principals(self) -> typing.Iterator[bsfs.schema.Predicate]:
         """Return the principal predicates, i.e., relations from/to the extraction subject."""
-        ent = self.schema.node(ns.bsfs.Entity)
+        ent = self.schema.node(ns.bsn.Entity)
         return (
             pred
             for pred