shacl2code 0.0.7__tar.gz → 0.0.8__tar.gz

{shacl2code-0.0.7 → shacl2code-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shacl2code
-Version: 0.0.7
+Version: 0.0.8
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git

{shacl2code-0.0.7 → shacl2code-0.0.8}/src/shacl2code/model.py

@@ -8,13 +8,13 @@ import typing
 from dataclasses import dataclass
 
 from rdflib import URIRef
-from rdflib.namespace import RDF, RDFS, OWL, SH, DefinedNamespace, Namespace
+from rdflib.namespace import RDF, RDFS, OWL, SH, XSD, DefinedNamespace, Namespace
 
 PATTERN_DATATYPES = [
-    "http://www.w3.org/2001/XMLSchema#string",
-    "http://www.w3.org/2001/XMLSchema#dateTime",
-    "http://www.w3.org/2001/XMLSchema#dateTimeStamp",
-    "http://www.w3.org/2001/XMLSchema#anyURI",
+    str(XSD.string),
+    str(XSD.dateTime),
+    str(XSD.dateTimeStamp),
+    str(XSD.anyURI),
 ]
 
 
@@ -103,8 +103,10 @@ class Model(object):
         class_iris = set()
         enum_iris = set()
         classes_by_iri = {}
+        all_class_iris = set()
 
         for cls_iri in self.model.subjects(RDF.type, OWL.Class):
+            all_class_iris.add(cls_iri)
             enum_values = []
 
             for value_iri in self.model.subjects(RDF.type, cls_iri):
@@ -161,6 +163,25 @@ class Model(object):
                 return value
             return default
 
+        def set_prop_range(p, range_id):
+            nonlocal enum_iris
+            nonlocal class_iris
+            nonlocal all_class_iris
+
+            if range_id in enum_iris:
+                p.enum_id = str(range_id)
+                return True
+
+            if range_id in class_iris:
+                p.class_id = str(range_id)
+                return True
+
+            if range_id in all_class_iris:
+                p.datatype = str(XSD.anyURI)
+                return True
+
+            return False
+
         for cls_iri in class_iris:
             c = Class(
                 _id=str(cls_iri),
@@ -203,13 +224,7 @@ class Model(object):
                 )
 
                 if range_id := self.model.value(obj_prop, SH["class"]):
-                    if range_id in enum_iris:
-                        p.enum_id = str(range_id)
-
-                    elif range_id in class_iris:
-                        p.class_id = str(range_id)
-
-                    else:
+                    if not set_prop_range(p, range_id):
                         raise ModelException(
                             f"Prop {prop} has unknown class restriction {range_id}"
                         )
@@ -218,14 +233,9 @@ class Model(object):
                     p.datatype = str(range_id)
 
                 elif range_id := self.model.value(prop, RDFS.range):
-                    if range_id in enum_iris:
-                        p.enum_id = str(range_id)
-
-                    elif range_id in class_iris:
-                        p.class_id = str(range_id)
-
-                    else:
+                    if not set_prop_range(p, range_id):
                         p.datatype = str(range_id)
+
                 else:
                     raise ModelException(f"Prop '{prop}' is missing range")
 

shacl2code-0.0.8/src/shacl2code/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.8"

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/data/model/test.ttl

@@ -140,6 +140,11 @@
         sh:path <test-class/regex-datetimestamp> ;
         sh:maxCount 1 ;
         sh:pattern "^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\dZ$"
+    ],
+    [
+        sh:class <non-shape-class> ;
+        sh:path <test-class/non-shape> ;
+        sh:maxCount 1
     ]
     .
 
@@ -303,6 +308,15 @@
     rdfs:range xsd:dateTimeStamp
     .
 
+<test-class/non-shape> a rdf:Property ;
+    rdfs:comment "A class with no shape" ;
+    rdfs:range <non-shape-class>
+    .
+
+<non-shape-class> a owl:Class ;
+    rdfs:comment "A class that is not a nodeshape"
+    .
+
 <enumType> a owl:Class ;
     rdfs:comment "An enumerated type"
     .

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/data/python/roundtrip.json

@@ -64,6 +64,7 @@
             "test-class/regex-datetime": "2024-03-11T00:00:00+01:00",
             "test-class/regex-datetimestamp": "2024-03-11T00:00:00Z",
             "test-class/regex-list": ["foo2", "foo3"],
+            "test-class/non-shape": "http://serialize.example.com/non-shape",
             "import": "foo",
             "encode": "foo"
         },

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/expect/jsonschema/test-context.json

@@ -403,6 +403,9 @@
                         "test-class/named-property": {
                             "$ref": "#/$defs/prop_testclass_named_property"
                         },
+                        "test-class/non-shape": {
+                            "$ref": "#/$defs/prop_testclass_testclassnonshape"
+                        },
                         "test-class/nonnegative-integer-prop": {
                             "$ref": "#/$defs/prop_testclass_testclassnonnegativeintegerprop"
                         },
@@ -538,6 +541,9 @@
         "prop_testclass_named_property": {
                     "type": "string"
         },
+        "prop_testclass_testclassnonshape": {
+                    "$ref": "#/$defs/anyURI"
+        },
         "prop_testclass_testclassnonnegativeintegerprop": {
                     "type": "integer",
                     "minimum": 0

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/expect/jsonschema/test.json

@@ -399,6 +399,9 @@
                         "http://example.org/test-class/named-property": {
                             "$ref": "#/$defs/prop_http_exampleorgtestclass_named_property"
                         },
+                        "http://example.org/test-class/non-shape": {
+                            "$ref": "#/$defs/prop_http_exampleorgtestclass_nonshape"
+                        },
                         "http://example.org/test-class/nonnegative-integer-prop": {
                             "$ref": "#/$defs/prop_http_exampleorgtestclass_nonnegativeintegerprop"
                         },
@@ -534,6 +537,9 @@
         "prop_http_exampleorgtestclass_named_property": {
                     "type": "string"
         },
+        "prop_http_exampleorgtestclass_nonshape": {
+                    "$ref": "#/$defs/anyURI"
+        },
         "prop_http_exampleorgtestclass_nonnegativeintegerprop": {
                     "type": "integer",
                     "minimum": 0

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/expect/python/test-context.py

@@ -1775,6 +1775,13 @@ class test_class(parent_class):
             iri="http://example.org/test-class/named-property",
             compact="test-class/named-property",
         )
+        # A class with no shape
+        self._add_property(
+            "test_class_non_shape",
+            AnyURIProp(),
+            iri="http://example.org/test-class/non-shape",
+            compact="test-class/non-shape",
+        )
         # a non-negative integer
         self._add_property(
             "test_class_nonnegative_integer_prop",

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/expect/python/test.py

@@ -1727,6 +1727,12 @@ class http_example_org_test_class(http_example_org_parent_class):
             StringProp(),
             iri="http://example.org/test-class/named-property",
         )
+        # A class with no shape
+        self._add_property(
+            "non_shape",
+            AnyURIProp(),
+            iri="http://example.org/test-class/non-shape",
+        )
         # a non-negative integer
         self._add_property(
             "nonnegative_integer_prop",

{shacl2code-0.0.7 → shacl2code-0.0.8}/tests/expect/raw/test.txt

@@ -10,7 +10,7 @@ Class(_id='http://example.org/node-kind-iri', clsname='http_//example.org/node-k
 Class(_id='http://example.org/node-kind-iri-or-blank', clsname='http_//example.org/node-kind-iri-or-blank', parent_ids=['http://example.org/link-class'], derived_ids=[], properties=[], comment='A class that can be either a blank node or an IRI', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
 Class(_id='http://example.org/parent-class', clsname='http_//example.org/parent-class', parent_ids=[], derived_ids=['http://example.org/aaa-derived-class', 'http://example.org/test-class'], properties=[], comment='The parent class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
 Class(_id='http://example.org/test-another-class', clsname='http_//example.org/test-another-class', parent_ids=[], derived_ids=[], properties=[], comment='Another class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
-Class(_id='http://example.org/test-class', clsname='http_//example.org/test-class', parent_ids=['http://example.org/parent-class'], derived_ids=['http://example.org/test-class-required', 'http://example.org/test-derived-class'], properties=[Property(path='http://example.org/encode', varname='encode', comment='A property that conflicts with an existing SHACLObject property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/import', varname='import', comment='A property that is a keyword', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/anyuri-prop', varname='anyuri-prop', comment='a URI', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#anyURI', pattern=''), Property(path='http://example.org/test-class/boolean-prop', varname='boolean-prop', comment='a boolean property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#boolean', pattern=''), Property(path='http://example.org/test-class/class-list-prop', varname='class-list-prop', comment='A test-class list property', max_count=None, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop', varname='class-prop', comment='A test-class property', max_count=1, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop-no-class', varname='class-prop-no-class', comment='A test-class property with no sh:class', max_count=1, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/datetime-list-prop', varname='datetime-list-prop', comment='A datetime list property', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetime-scalar-prop', varname='datetime-scalar-prop', comment='A scalar datetime property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetimestamp-scalar-prop', varname='datetimestamp-scalar-prop', comment='A scalar dateTimeStamp property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern=''), Property(path='http://example.org/test-class/enum-list-prop', varname='enum-list-prop', comment='A enum list property', max_count=None, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop', varname='enum-prop', comment='A enum property', max_count=1, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop-no-class', varname='enum-prop-no-class', comment='A enum property with no sh:class', max_count=1, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/float-prop', varname='float-prop', comment='a float property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#decimal', pattern=''), Property(path='http://example.org/test-class/integer-prop', varname='integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#integer', pattern=''), Property(path='http://example.org/test-class/named-property', varname=rdflib.term.Literal('named_property'), comment='A named property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/nonnegative-integer-prop', varname='nonnegative-integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#nonNegativeInteger', pattern=''), Property(path='http://example.org/test-class/positive-integer-prop', varname='positive-integer-prop', comment='A positive integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#positiveInteger', pattern=''), Property(path='http://example.org/test-class/regex', varname='regex', comment='A regex validated string', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/regex-datetime', varname='regex-datetime', comment='A regex dateTime', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d\\+01:00$'), Property(path='http://example.org/test-class/regex-datetimestamp', varname='regex-datetimestamp', comment='A regex dateTimeStamp', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\dZ$'), Property(path='http://example.org/test-class/regex-list', varname='regex-list', comment='A regex validated string list', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/string-list-no-datatype', varname='string-list-no-datatype', comment='A string list property with no sh:datatype', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-list-prop', varname='string-list-prop', comment='A string list property', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-scalar-prop', varname='string-scalar-prop', comment='A scalar string propery', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='The test class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
+Class(_id='http://example.org/test-class', clsname='http_//example.org/test-class', parent_ids=['http://example.org/parent-class'], derived_ids=['http://example.org/test-class-required', 'http://example.org/test-derived-class'], properties=[Property(path='http://example.org/encode', varname='encode', comment='A property that conflicts with an existing SHACLObject property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/import', varname='import', comment='A property that is a keyword', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/anyuri-prop', varname='anyuri-prop', comment='a URI', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#anyURI', pattern=''), Property(path='http://example.org/test-class/boolean-prop', varname='boolean-prop', comment='a boolean property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#boolean', pattern=''), Property(path='http://example.org/test-class/class-list-prop', varname='class-list-prop', comment='A test-class list property', max_count=None, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop', varname='class-prop', comment='A test-class property', max_count=1, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/class-prop-no-class', varname='class-prop-no-class', comment='A test-class property with no sh:class', max_count=1, min_count=None, enum_id='', class_id='http://example.org/test-class', datatype='', pattern=''), Property(path='http://example.org/test-class/datetime-list-prop', varname='datetime-list-prop', comment='A datetime list property', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetime-scalar-prop', varname='datetime-scalar-prop', comment='A scalar datetime property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern=''), Property(path='http://example.org/test-class/datetimestamp-scalar-prop', varname='datetimestamp-scalar-prop', comment='A scalar dateTimeStamp property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern=''), Property(path='http://example.org/test-class/enum-list-prop', varname='enum-list-prop', comment='A enum list property', max_count=None, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop', varname='enum-prop', comment='A enum property', max_count=1, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/enum-prop-no-class', varname='enum-prop-no-class', comment='A enum property with no sh:class', max_count=1, min_count=None, enum_id='http://example.org/enumType', class_id='', datatype='', pattern=''), Property(path='http://example.org/test-class/float-prop', varname='float-prop', comment='a float property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#decimal', pattern=''), Property(path='http://example.org/test-class/integer-prop', varname='integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#integer', pattern=''), Property(path='http://example.org/test-class/named-property', varname=rdflib.term.Literal('named_property'), comment='A named property', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/non-shape', varname='non-shape', comment='A class with no shape', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#anyURI', pattern=''), Property(path='http://example.org/test-class/nonnegative-integer-prop', varname='nonnegative-integer-prop', comment='a non-negative integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#nonNegativeInteger', pattern=''), Property(path='http://example.org/test-class/positive-integer-prop', varname='positive-integer-prop', comment='A positive integer', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#positiveInteger', pattern=''), Property(path='http://example.org/test-class/regex', varname='regex', comment='A regex validated string', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/regex-datetime', varname='regex-datetime', comment='A regex dateTime', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTime', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d\\+01:00$'), Property(path='http://example.org/test-class/regex-datetimestamp', varname='regex-datetimestamp', comment='A regex dateTimeStamp', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#dateTimeStamp', pattern='^\\d\\d\\d\\d-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\dZ$'), Property(path='http://example.org/test-class/regex-list', varname='regex-list', comment='A regex validated string list', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='^foo\\d'), Property(path='http://example.org/test-class/string-list-no-datatype', varname='string-list-no-datatype', comment='A string list property with no sh:datatype', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-list-prop', varname='string-list-prop', comment='A string list property', max_count=None, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/string-scalar-prop', varname='string-scalar-prop', comment='A scalar string propery', max_count=1, min_count=None, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='The test class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
 Class(_id='http://example.org/test-class-required', clsname='http_//example.org/test-class-required', parent_ids=['http://example.org/test-class'], derived_ids=[], properties=[Property(path='http://example.org/test-class/required-string-list-prop', varname='required-string-list-prop', comment='A required string list property', max_count=2, min_count=1, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern=''), Property(path='http://example.org/test-class/required-string-scalar-prop', varname='required-string-scalar-prop', comment='A required scalar string property', max_count=1, min_count=1, enum_id='', class_id='', datatype='http://www.w3.org/2001/XMLSchema#string', pattern='')], comment='', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
 Class(_id='http://example.org/test-derived-class', clsname='http_//example.org/test-derived-class', parent_ids=['http://example.org/test-class'], derived_ids=[], properties=[], comment='A class derived from test-class', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))
 Class(_id='http://example.org/aaa-derived-class', clsname='http_//example.org/aaa-derived-class', parent_ids=['http://example.org/parent-class'], derived_ids=[], properties=[], comment='Derived class that sorts before the parent to test ordering', id_property=None, node_kind=rdflib.term.URIRef('http://www.w3.org/ns/shacl#BlankNodeOrIRI'))

shacl2code-0.0.7/src/shacl2code/version.py

@@ -1 +0,0 @@
-VERSION = "0.0.7"