adapt to schema interface update: owl:maxCardinality changed to bsfs:unique

9 files changed, 19 insertions, 20 deletions

diff --git a/bsie/base/extractor.py b/bsie/base/extractor.py
index 2fc4f18..75b7173 100644
--- a/bsie/base/extractor.py
+++ b/bsie/base/extractor.py
@@ -23,7 +23,6 @@ __all__: typing.Sequence[str] = (
 # NOTE: The definition here is only for convenience; Each Extractor must implement its use, if so desired.
 SCHEMA_PREAMBLE = '''
     # common external prefixes
-    prefix owl: <http://www.w3.org/2002/07/owl#>
     prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
     prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
     prefix xsd: <http://www.w3.org/2001/XMLSchema#>
diff --git a/bsie/extractor/generic/path.py b/bsie/extractor/generic/path.py
index f346f97..e6b901e 100644
--- a/bsie/extractor/generic/path.py
+++ b/bsie/extractor/generic/path.py
@@ -36,7 +36,7 @@ class Path(extractor.Extractor):
                 rdfs:range xsd:string ;
                 rdfs:label "File name"^^xsd:string ;
                 schema:description "Filename of entity in some filesystem."^^xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             '''))
         self._callmap = {
             self.schema.predicate(ns.bse.filename): self.__filename,
diff --git a/bsie/extractor/generic/stat.py b/bsie/extractor/generic/stat.py
index 7088c0a..6493d37 100644
--- a/bsie/extractor/generic/stat.py
+++ b/bsie/extractor/generic/stat.py
@@ -36,7 +36,7 @@ class Stat(extractor.Extractor):
                 rdfs:range xsd:integer ;
                 rdfs:label "File size"^^xsd:string ;
                 schema:description "File size of entity in some filesystem."^^xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             '''))
         self._callmap = {
             self.schema.predicate(ns.bse.filesize): self.__filesize,
diff --git a/test/base/test_extractor.py b/test/base/test_extractor.py
index 7a00079..be876ad 100644
--- a/test/base/test_extractor.py
+++ b/test/base/test_extractor.py
@@ -23,11 +23,11 @@ class StubExtractor(extractor.Extractor):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             bse:comment rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
         '''))
 
     def extract(self, subject, content, predicates):
diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py
index aa33fb4..7f72ccf 100644
--- a/test/extractor/generic/test_constant.py
+++ b/test/extractor/generic/test_constant.py
@@ -23,11 +23,11 @@ class TestConstant(unittest.TestCase):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             bse:comment rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             '''
         tuples = [
             (ns.bse.author, 'Me, myself, and I'),
@@ -58,11 +58,11 @@ class TestConstant(unittest.TestCase):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             bse:comment rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             '''
         # can create a schema
         self.assertIsInstance(Constant(schema, [
@@ -83,13 +83,13 @@ class TestConstant(unittest.TestCase):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             '''
         schema_b = '''
             bse:comment rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "INF"^^xsd:number .
+                bsfs:unique "false"^^xsd:boolean .
             '''
         tuples_a = [(ns.bse.author, 'Me, myself, and I')]
         tuples_b = [(ns.bse.comment, 'the quick brown fox jumps over the lazy dog.') ]
diff --git a/test/extractor/generic/test_path.py b/test/extractor/generic/test_path.py
index 9376c7c..aa21b04 100644
--- a/test/extractor/generic/test_path.py
+++ b/test/extractor/generic/test_path.py
@@ -35,7 +35,7 @@ class TestPath(unittest.TestCase):
                 bse:filename rdfs:subClassOf bsfs:Predicate ;
                     rdfs:domain bsfs:Entity ;
                     rdfs:range xsd:string ;
-                    owl:maxCardinality "INF"^^xsd:number .
+                    bsfs:unique "false"^^xsd:boolean .
                 '''))
 
     def test_extract(self):
diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py
index 26dad6a..bed5fab 100644
--- a/test/extractor/generic/test_stat.py
+++ b/test/extractor/generic/test_stat.py
@@ -36,7 +36,7 @@ class TestStat(unittest.TestCase):
                 bse:filesize rdfs:subClassOf bsfs:Predicate ;
                     rdfs:domain bsfs:Entity ;
                     rdfs:range xsd:integer ;
-                    owl:maxCardinality "INF"^^xsd:number .
+                    bsfs:unique "false"^^xsd:boolean .
                 '''))
 
     def test_extract(self):
diff --git a/test/tools/test_builder.py b/test/tools/test_builder.py
index bef0e9d..bc6f903 100644
--- a/test/tools/test_builder.py
+++ b/test/tools/test_builder.py
@@ -115,11 +115,11 @@ class TestExtractorBuilder(unittest.TestCase):
                     bse:author rdfs:subClassOf bsfs:Predicate ;
                         rdfs:domain bsfs:Entity ;
                         rdfs:range xsd:string ;
-                        owl:maxCardinality "1"^^xsd:number .
+                        bsfs:unique "true"^^xsd:boolean .
                     bse:rating rdfs:subClassOf bsfs:Predicate ;
                         rdfs:domain bsfs:Entity ;
                         rdfs:range xsd:integer ;
-                        owl:maxCardinality "1"^^xsd:number .
+                        bsfs:unique "true"^^xsd:boolean .
                     ''',
                 'tuples': [
                     ('http://bsfs.ai/schema/Entity#author', 'Me, myself, and I'),
@@ -132,11 +132,11 @@ class TestExtractorBuilder(unittest.TestCase):
                     bse:author rdfs:subClassOf bsfs:Predicate ;
                         rdfs:domain bsfs:Entity ;
                         rdfs:range xsd:string ;
-                        owl:maxCardinality "1"^^xsd:number .
+                        bsfs:unique "true"^^xsd:boolean .
                     bse:rating rdfs:subClassOf bsfs:Predicate ;
                         rdfs:domain bsfs:Entity ;
                         rdfs:range xsd:integer ;
-                        owl:maxCardinality "1"^^xsd:number .
+                        bsfs:unique "true"^^xsd:boolean .
                     ''', [
             ('http://bsfs.ai/schema/Entity#author', 'Me, myself, and I'),
             ('http://bsfs.ai/schema/Entity#rating', 123),
@@ -166,7 +166,7 @@ class TestPipelineBuilder(unittest.TestCase):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             '''
         c_tuples = [('http://bsfs.ai/schema/Entity#author', 'Me, myself, and I')]
         # prepare builders
diff --git a/test/tools/test_pipeline.py b/test/tools/test_pipeline.py
index 9888d2e..f98b329 100644
--- a/test/tools/test_pipeline.py
+++ b/test/tools/test_pipeline.py
@@ -33,7 +33,7 @@ class TestPipeline(unittest.TestCase):
             bse:author rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:string ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             '''
         tupA = [('http://bsfs.ai/schema/Entity#author', 'Me, myself, and I')]
         # constant B
@@ -41,7 +41,7 @@ class TestPipeline(unittest.TestCase):
             bse:rating rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
                 rdfs:range xsd:integer ;
-                owl:maxCardinality "1"^^xsd:number .
+                bsfs:unique "true"^^xsd:boolean .
             '''
         tupB = [('http://bsfs.ai/schema/Entity#rating', 123)]
         # extractors/readers