From 4fead04055be4967d9ea3b24ff61fe37a93108dd Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Sat, 4 Mar 2023 13:31:11 +0100
Subject: namespace refactoring and cleanup

---
 bsfs/graph/ac/null.py |  2 +-
 bsfs/graph/nodes.py   |  4 ++--
 bsfs/graph/resolve.py |  4 ++--
 bsfs/graph/schema.nt  | 11 ++++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'bsfs/graph')

diff --git a/bsfs/graph/ac/null.py b/bsfs/graph/ac/null.py
index 3a391aa..c9ec7d0 100644
--- a/bsfs/graph/ac/null.py
+++ b/bsfs/graph/ac/null.py
@@ -24,7 +24,7 @@ class NullAC(base.AccessControlBase):
 
     def is_protected_predicate(self, pred: schema.Predicate) -> bool:
         """Return True if a predicate cannot be modified manually."""
-        return pred.uri == ns.bsm.t_created
+        return pred.uri == ns.bsn.t_created
 
     def create(self, node_type: schema.Node, guids: typing.Iterable[URI]):
         """Perform post-creation operations on nodes, e.g. ownership information."""
diff --git a/bsfs/graph/nodes.py b/bsfs/graph/nodes.py
index 74f4c4f..47b0217 100644
--- a/bsfs/graph/nodes.py
+++ b/bsfs/graph/nodes.py
@@ -170,7 +170,7 @@ class Nodes():
             self._backend.commit()
 
         except (
-                errors.PermissionDeniedError, # tried to set a protected predicate (ns.bsm.t_created)
+                errors.PermissionDeniedError, # tried to set a protected predicate
                 errors.ConsistencyError, # node types are not in the schema or don't match the predicate
                 errors.InstanceError, # guids/values don't have the correct type
                 TypeError, # value is supposed to be a Nodes instance
@@ -394,7 +394,7 @@ class Nodes():
             self._backend.create(node_type, missing)
             # add bookkeeping triples
             self._backend.set(node_type, missing,
-                self._backend.schema.predicate(ns.bsm.t_created), [time.time()])
+                self._backend.schema.predicate(ns.bsn.t_created), [time.time()])
             # add permission triples
             self._ac.create(node_type, missing)
         # return available nodes
diff --git a/bsfs/graph/resolve.py b/bsfs/graph/resolve.py
index 95dcfc1..a58eb67 100644
--- a/bsfs/graph/resolve.py
+++ b/bsfs/graph/resolve.py
@@ -27,8 +27,8 @@ class Filter():
         input:  Any(ns.bse.tag, Is(Nodes(...)))
         output: Any(ns.bse.tag, Or(Is(...), Is(...), ...)))
 
-    >>> tags = graph.node(ns.bsfs.Tag, 'http://example.com/me/tag#1234')
-    >>> graph.get(ns.bsfs.Entity, ast.filter.Any(ns.bse.tag, ast.filter.Is(tags)))
+    >>> tags = graph.node(ns.bsn.Tag, 'http://example.com/me/tag#1234')
+    >>> graph.get(ns.bsn.Entity, ast.filter.Any(ns.bse.tag, ast.filter.Is(tags)))
 
     """
 
diff --git a/bsfs/graph/schema.nt b/bsfs/graph/schema.nt
index cba5e80..37bba5e 100644
--- a/bsfs/graph/schema.nt
+++ b/bsfs/graph/schema.nt
@@ -4,15 +4,16 @@ prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 
 # bsfs prefixes
-prefix bsfs: <http://bsfs.ai/schema/>
-prefix bsm: <http://bsfs.ai/schema/Meta#>
+prefix bsfs: <https://schema.bsfs.io/core/>
+prefix bsl: <https://schema.bsfs.io/core/Literal/>
+prefix bsn: <https://schema.bsfs.io/core/Node#>
 
 # literals
-bsfs:Number rdfs:subClassOf bsfs:Literal .
-xsd:float rdfs:subClassOf bsfs:Number .
+bsl:Number rdfs:subClassOf bsfs:Literal .
+xsd:float rdfs:subClassOf bsl:Number .
 
 # predicates
-bsm:t_created rdfs:subClassOf bsfs:Predicate ;
+bsn:t_created rdfs:subClassOf bsfs:Predicate ;
     rdfs:domain bsfs:Node ;
     rdfs:range xsd:float ;
     bsfs:unique "true"^^xsd:boolean .
-- 
cgit v1.2.3