4 files changed, 16 insertions, 35 deletions
diff --git a/bsfs/schema/__init__.py b/bsfs/schema/__init__.py
index f53512e..ca2e0cd 100644
--- a/bsfs/schema/__init__.py
+++ b/bsfs/schema/__init__.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import typing
 
diff --git a/bsfs/schema/schema.py b/bsfs/schema/schema.py
index 0de4203..c104436 100644
--- a/bsfs/schema/schema.py
+++ b/bsfs/schema/schema.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 from collections import abc, namedtuple
 import typing
diff --git a/bsfs/schema/serialize.py b/bsfs/schema/serialize.py
index acc009a..ea8b2f4 100644
--- a/bsfs/schema/serialize.py
+++ b/bsfs/schema/serialize.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # standard imports
 import itertools
 import typing
@@ -246,13 +241,14 @@ def to_string(schema_inst: schema.Schema, fmt: str = 'turtle') -> str:
             graph.add(triple)
     # add known namespaces for readability
     # FIXME: more generically?
-    graph.bind('bse', rdflib.URIRef(ns.bse['']))
-    graph.bind('bsfs', rdflib.URIRef(ns.bsfs['']))
-    graph.bind('bsm', rdflib.URIRef(ns.bsm['']))
-    graph.bind('rdf', rdflib.URIRef(ns.rdf['']))
-    graph.bind('rdfs', rdflib.URIRef(ns.rdfs['']))
-    graph.bind('schema', rdflib.URIRef(ns.schema['']))
-    graph.bind('xsd', rdflib.URIRef(ns.xsd['']))
+    graph.bind('bsfs', rdflib.URIRef(ns.bsfs + '/'))
+    graph.bind('bsl', rdflib.URIRef(ns.bsl + '/'))
+    graph.bind('bsn', rdflib.URIRef(ns.bsn + '#'))
+    graph.bind('bse', rdflib.URIRef(ns.bsfs.Entity() + '#'))
+    graph.bind('rdf', rdflib.URIRef(ns.rdf))
+    graph.bind('rdfs', rdflib.URIRef(ns.rdfs))
+    graph.bind('schema', rdflib.URIRef(ns.schema))
+    graph.bind('xsd', rdflib.URIRef(ns.xsd))
     # serialize to turtle
     return graph.serialize(format=fmt)
 
diff --git a/bsfs/schema/types.py b/bsfs/schema/types.py
index 12e7e94..5834df8 100644
--- a/bsfs/schema/types.py
+++ b/bsfs/schema/types.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import typing
 
@@ -103,7 +98,7 @@ class _Type():
             parent: typing.Optional['_Type'] = None,
             **annotations: typing.Any,
             ):
-        self.uri = uri
+        self.uri = URI(uri)
         self.parent = parent
         self.annotations = annotations
 
@@ -381,31 +376,31 @@ ROOT_LITERAL = Literal(
     )
 
 ROOT_BLOB = Literal(
-    uri=ns.bsfs.BinaryBlob,
+    uri=ns.bsl.BinaryBlob,
     parent=ROOT_LITERAL,
     )
 
 ROOT_NUMBER = Literal(
-    uri=ns.bsfs.Number,
+    uri=ns.bsl.Number,
     parent=ROOT_LITERAL,
     )
 
 ROOT_TIME = Literal(
-    uri=ns.bsfs.Time,
+    uri=ns.bsl.Time,
     parent=ROOT_LITERAL,
     )
 
 ROOT_ARRAY = Literal(
-    uri=ns.bsfs.Array,
+    uri=ns.bsl.Array,
     parent=ROOT_LITERAL,
     )
 
 ROOT_FEATURE = Feature(
-    uri=ns.bsfs.Feature,
+    uri=ns.bsl.Array.Feature,
     parent=ROOT_ARRAY,
     dimension=1,
-    dtype=ns.bsfs.f16,
-    distance=ns.bsfs.euclidean,
+    dtype=ns.bsfs.dtype().f16,
+    distance=ns.bsd.euclidean,
     )
 
 # essential predicates