oldaplib 0.2.9__tar.gz → 0.2.10__tar.gz

{oldaplib-0.2.9 → oldaplib-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.2.9
+Version: 0.2.10
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/ontologies/oldap.trig

@@ -14,7 +14,21 @@
 
 :shacl {
 
-    :shapes dcterms:hasVersion "0.1.0"^^xsd:string .
+    :shapes schema:version "0.1.0"^^xsd:string .
+
+    #
+    # Here we add some SHACL definition in order to indicate that a property is a "statement property"
+    # for RDF*star statements about statements.
+    #
+    :statementProperty a sh:Property ;
+        sh:annotationProperty :statementProperty .
+
+    :statementPropertyShape
+        a sh:PropertyShape ;
+        sh:path :statementProperty ;
+        sh:datatype xsd:boolean ;
+        sh:minCount 0 ;
+        sh:maxCount 1 .
 
     #
     # Define a SHACL property group for all system properties. This info can be used to hide these properties from
@@ -32,7 +46,7 @@
     #
     :AdminPermissionShape a sh:NodeShape, :AdminPermission ;
         sh:targetClass :AdminPermission ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -46,9 +60,13 @@
         sh:property rdfs:labelShape ;
         sh:property rdfs:commentShape .
 
+    :hasAdminPermissionShape a sh:PropertyShape ;
+        sh:path :hasAdminPermission ;
+        sh:class :AdminPermission .
+
     :DataPermissionShape a sh:NodeShape, :DataPermission ;
         sh:targetClass :DataPermission ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -80,7 +98,7 @@
     #
     :PermissionSetShape a sh:NodeShape, :PermissionSet ;
         sh:targetClass :PermissionSet ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -114,7 +132,7 @@
         sh:property
             [
                 sh:path :givesPermission ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -135,7 +153,7 @@
         sh:property
             [
                 sh:path :definedByProject ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -158,7 +176,7 @@
     #
     :ProjectShape a sh:NodeShape, :Project ;
         sh:targetClass :Project ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -195,7 +213,7 @@
         sh:property
             [
                 sh:path :projectShortName ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -210,7 +228,7 @@
         sh:property
             [
                 sh:path :namespaceIri ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -225,7 +243,7 @@
         sh:property
             [
                 sh:path :projectStart ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -240,7 +258,7 @@
         sh:property
             [
                 sh:path :projectEnd ;
-                dcterms:hasVersion "1.0.0"^^xsd:string ;
+                schema:version "1.0.0"^^xsd:string ;
                 dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -258,7 +276,7 @@
     #
     :UserShape a sh:NodeShape, :User ;
         sh:targetClass :User ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -336,6 +354,7 @@
                 dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
                 dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
                 sh:class :Project ;
+                :statementShape :inProjectStatementShape ;
             ] ;
         sh:property
             [
@@ -359,6 +378,13 @@
             ] ;
         sh:closed true .
 
+    :inProjectStatementShape a sh:NodeShape ;
+        sh:property
+            [
+                sh:path :hasAdminPermission ;
+                sh:class :AdminPermission ;
+            ] .
+
     #
     # Hierarchical lists are implemented using :List's and :ListNodes. We will use some skos vocabulary
     #
@@ -695,11 +721,26 @@
         owl:versionInfo "0.1.0"^^xsd:string ;
         owl:imports <http://www.w3.org/2004/02/skos/core>, <http://purl.org/dc/terms/> .
 
+    ###############################################################################
+    # Extension (non-standard) for RDF*star
+    ###############################################################################
+    :statementShape a owl:ObjectProperty ;
+        rdfs:label "statement shape for RDF-star annotation"@en ;
+        rdfs:comment "Links a sh:PropertyShape to a sh:NodeShape that constrains annotations on <<S P O>>."@en ;
+        rdfs:domain sh:PropertyShape ;
+        rdfs:range  sh:NodeShape .
+
+    :statementProperty a owl:DatatypeProperty ;
+        rdfs:domain sh:PropertyShape ;
+        rdfs:range xsd:boolean ;
+        rdfs:label "Statement property flag"@en ;
+        rdfs:comment "Indicates whether the SHACL property is used as a statement-level (RDF-star) annotation property."@en .
 
     ###############################################################################
     # Standard Properties that are used everywhere
     ###############################################################################
-
+    :hasAdminPermission a owl:ObjectProperty ;
+        rdfs:range :AdminPermission .
 
     ###############################################################################
     # Properties that are used by skos,

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/ontologies/shared.trig

@@ -15,14 +15,14 @@
 @prefix : <http://oldap.org/shared#> .
 
 shared:shacl {
-    shared:shapes dcterms:hasVersion "0.1.0"^^xsd:string .
+    shared:shapes schema:version "0.1.0"^^xsd:string .
 
     #
     # Define the SHACL for OLAPDLIB's use of rdfs:label
     #
     rdfs:labelShape a sh:PropertyShape ;
         sh:path rdfs:label ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -38,7 +38,7 @@ shared:shacl {
     #
     rdfs:commentShape a sh:PropertyShape ;
         sh:path rdfs:comment ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -55,7 +55,7 @@ shared:shacl {
 
     dcterms:descriptionShape a sh:PropertyShape ;
         sh:path dcterms:description ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -69,7 +69,7 @@ shared:shacl {
 
     dcterms:rightsShape a sh:PropertyShape ;
         sh:path dcterms:rights ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -83,7 +83,7 @@ shared:shacl {
 
     dcterms:abstractShape a sh:PropertyShape ;
         sh:path dcterms:abstract ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -99,7 +99,7 @@ shared:shacl {
 
     dcterms:accessRightsShape a sh:PropertyShape ;
         sh:path dcterms:accessRights ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -119,7 +119,7 @@ shared:shacl {
     #
     dcterms:creatorShape a sh:PropertyShape ;
         sh:path dcterms:creator ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -131,7 +131,7 @@ shared:shacl {
     #
     dcterms:createdShape a sh:PropertyShape ;
         sh:path dcterms:created ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
@@ -143,7 +143,7 @@ shared:shacl {
     #
     dcterms:contributorShape a sh:PropertyShape ;
         sh:path dcterms:contributor ;
-        dcterms:hasVersion "1.0.0"^^xsd:string ;
+        schema:version "1.0.0"^^xsd:string ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/src/datamodel.py

@@ -372,7 +372,7 @@ class DataModel(Model):
         SELECT ?version
         FROM {cls.__graph}:shacl
         WHERE {{
-            {cls.__graph}:shapes dcterms:hasVersion ?version .
+            {cls.__graph}:shapes schema:version ?version .
         }}
         """
         jsonobj = con.query(query)
@@ -490,7 +490,7 @@ class DataModel(Model):
 
         sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{\n'
         sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH {self.__graph}:shacl {{\n'
-        sparql += f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:shapes dcterms:hasVersion {self.__version.toRdf} .\n'
+        sparql += f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n'
         sparql += '\n'
 
         for propiri, propclass in self.__propclasses.items():
@@ -644,7 +644,7 @@ class DataModel(Model):
             f.write('\n')
             f.write(context.turtle_context)
             f.write(f'\n{blank:{indent * indent_inc}}{self.__graph}:shacl {{\n')
-            f.write(f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:shapes dcterms:hasVersion {self.__version.toRdf} .\n')
+            f.write(f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n')
             f.write('\n')
             for iri, prop in self.__propclasses.items():
                 if not prop.internal:

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/src/enums/owlpropertytype.py

@@ -8,9 +8,11 @@ from oldaplib.src.helpers.serializer import serializer
 class OwlPropertyType(Enum):
     """
     Enumeration of the two types of RDF properties that OWL distinguishes
+    NOTE:
     """
     OwlDataProperty = 'owl:DatatypeProperty'
     OwlObjectProperty = 'owl:ObjectProperty'
+    StatementProperty = 'rdf:Property'
 
     @property
     def toRdf(self):

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/src/enums/propertyclassattr.py

@@ -36,7 +36,7 @@ class PropClassAttr(AttributeClass):
     """
     # order: (QName, mandatory, immutable, datatype)
     SUBPROPERTY_OF = ('rdfs:subPropertyOf', False, False, Iri)
-    TYPE = ('rdf:type', False, False, OwlPropertyType)
+    TYPE = ('rdf:type', False, True, OwlPropertyType)
     CLASS = ('sh:class', False, False, Iri)
     DATATYPE = ('sh:datatype', False, False, XsdDatatypes)
     NAME = ('sh:name', False, False, LangString)  # needs notifier

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/src/propertyclass.py

@@ -165,6 +165,7 @@ class PropertyClass(Model, Notify):
     _projectShortName: Xsd_NCName
     _projectIri: Iri
     _property_class_iri: Iri | None
+    _statementProperty: bool
     _internal: Iri | None
     _force_external: bool
     #_attributes: PropClassAttrContainer
@@ -194,6 +195,7 @@ class PropertyClass(Model, Notify):
                  property_class_iri: Iri | str | None = None,
                  notifier: Callable[[PropClassAttr], None] | None = None,
                  notify_data: PropClassAttr | None = None,
+                 statement_property: bool = False,
                  _internal: Iri | None = None,  # DO NOT USE!! Only for serialization!
                  _force_external: bool | None = None,  # DO NOT USE!! Only for serialization!
                  _from_triplestore: bool = False,
@@ -234,6 +236,7 @@ class PropertyClass(Model, Notify):
                        validate=validate)
         Notify.__init__(self, notifier, notify_data)
 
+        self._statementProperty = statement_property
         if not isinstance(project, Project):
             if not isinstance(project, (Iri, Xsd_NCName)):
                 project = IriOrNCName(project, validate=validate)
@@ -290,12 +293,15 @@ class PropertyClass(Model, Notify):
             raise OldapErrorInconsistency(f'It\'s not possible to use both DATATYPE="{self._attributes[PropClassAttr.DATATYPE]}" and CLASS={self._attributes[PropClassAttr.CLASS]} restrictions.')
 
         # setting property type for OWL which distinguished between Data- and Object-properties
-        if self._attributes.get(PropClassAttr.CLASS) is not None:
-            self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlObjectProperty
-            if self._attributes.get(PropClassAttr.DATATYPE) is not None:
-                raise OldapError(f'Datatype "{self._attributes.get(PropClassAttr.DATATYPE)}" not possible for OwlObjectProperty')
+        if self._statementProperty:
+            self._attributes[PropClassAttr.TYPE] = OwlPropertyType.StatementProperty
         else:
-            self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlDataProperty
+            if self._attributes.get(PropClassAttr.CLASS) is not None:
+                self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlObjectProperty
+                if self._attributes.get(PropClassAttr.DATATYPE) is not None:
+                    raise OldapError(f'Datatype "{self._attributes.get(PropClassAttr.DATATYPE)}" not possible for OwlObjectProperty')
+            else:
+                self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlDataProperty
 
         #
         # set the class properties
@@ -468,6 +474,7 @@ class PropertyClass(Model, Notify):
                         notifier=self._notifier,
                         data=deepcopy(self._notify_data, memo))
         # Copy internals of Model:
+        instance._statementProperty = deepcopy(self._statementProperty, memo)
         instance._attributes = deepcopy(self._attributes, memo)
         instance._changset = deepcopy(self._changeset, memo)
         # Copy remaining PropertyClass attributes
@@ -528,6 +535,15 @@ class PropertyClass(Model, Notify):
         """
         return self._internal
 
+    @property
+    def statementProperty(self) -> bool:
+        """
+        Return the statementProperty
+        :return: statementProperty
+        :rtype: bool
+        """
+        return self._statementProperty
+
     def force_external(self) -> None:
         """
         Ensures that the property is created as a standalone property not tied to any resource.
@@ -712,11 +728,11 @@ class PropertyClass(Model, Notify):
                     self._property_class_iri = val
                 else:
                     raise OldapError(f'Inconsistency in SHACL "sh:path" of "{self._property_class_iri}" ->"{val}"')
-            elif key == 'dcterms:hasVersion':
+            elif key == 'schema:version':
                 if isinstance(val, Xsd_string):
                     self.__version = SemanticVersion.fromString(str(val))
                 else:
-                    raise OldapError(f'Inconsistency in SHACL "dcterms:hasVersion"')
+                    raise OldapError(f'Inconsistency in SHACL "schema:version"')
             elif key == 'dcterms:creator':
                 if isinstance(val, Iri):
                     self._creator = val
@@ -737,6 +753,11 @@ class PropertyClass(Model, Notify):
                     self._modified = val
                 else:
                     raise OldapError(f'Inconsistency in SHACL "dcterms:modified"')
+            elif key == 'oldap:statementProperty':
+                if isinstance(val, Xsd_boolean):
+                    self._statementProperty = val
+                else:
+                    raise OldapError(f'Inconsistency in SHACL "oldap:statementProperty (type={type(val)}"')
             elif key == 'sh:node':
                 if str(val).endswith("Shape"):
                     refprop = Iri(str(val)[:-5], validate=False)
@@ -806,6 +827,8 @@ class PropertyClass(Model, Notify):
                         self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlDataProperty
                     elif obj == 'owl:ObjectProperty':
                         self._attributes[PropClassAttr.TYPE] = OwlPropertyType.OwlObjectProperty
+                    elif obj == 'rdf:Property':
+                        self._attributes[PropClassAttr.TYPE] = OwlPropertyType.StatementProperty
                 case 'owl:subPropertyOf':
                     self._attributes[PropClassAttr.SUBPROPERTY_OF] = obj
                 case 'rdfs:range':
@@ -832,6 +855,12 @@ class PropertyClass(Model, Notify):
         #
         # Consistency checks
         #
+        if self._statementProperty:
+            if self._attributes.get(PropClassAttr.TYPE) != OwlPropertyType.StatementProperty:
+                raise OldapErrorInconsistency(f'Property "{self._property_class_iri}" is a statementProperty, but not an StatementProperty.')
+        else:
+            if self._attributes.get(PropClassAttr.TYPE) == OwlPropertyType.StatementProperty:
+                raise OldapErrorInconsistency(f'Property "{self._property_class_iri}" is not a statementProperty, but an StatementProperty.')
         if self._attributes[PropClassAttr.TYPE] == OwlPropertyType.OwlDataProperty:
             if not datatype:
                 raise OldapError(f'OwlDataProperty "{self._property_class_iri}" has no rdfs:range datatype defined!')
@@ -946,11 +975,13 @@ class PropertyClass(Model, Notify):
             sparql += f'\n{blank:{(indent + 1) * indent_inc}} {bnode} sh:path {self._property_class_iri.toRdf}'
         else:
             sparql += f'\n{blank:{(indent + 1) * indent_inc}}sh:path {self._property_class_iri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:hasVersion {self.__version.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}schema:version {self.__version.toRdf}'
         sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
         sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:created {timestamp.toRdf}'
         sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
         sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:modified {timestamp.toRdf}'
+        if self._statementProperty:
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:statementProperty true'
         for prop, value in self._attributes.items():
             if prop == PropClassAttr.TYPE:
                 continue
@@ -1114,7 +1145,6 @@ class PropertyClass(Model, Notify):
         try:
             self._con.transaction_update(sparql)
         except OldapError as err:
-            print(sparql)
             self._con.transaction_abort()
             raise
         try:

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/src/resourceclass.py

@@ -719,7 +719,7 @@ class ResourceClass(Model, Notify):
         for key, val in attributes.items():
             if key == 'sh:targetClass':
                 continue
-            if key == 'dcterms:hasVersion':
+            if key == 'schema:version':
                 self.__version = SemanticVersion.fromString(val[0])
             elif key == 'dcterms:creator':
                 self._creator = val[0]
@@ -1095,7 +1095,7 @@ class ResourceClass(Model, Notify):
         sparql = ''
         sparql += f'{blank:{(indent + 1)*indent_inc}}{self._owlclass_iri}Shape a sh:NodeShape, {self._owlclass_iri.toRdf}'
         sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}sh:targetClass {self._owlclass_iri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}dcterms:hasVersion {self.__version.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}schema:version {self.__version.toRdf}'
         self._created = timestamp
         sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}dcterms:created {timestamp.toRdf}'
         sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}dcterms:creator {self._creator.toRdf}'
@@ -1158,7 +1158,7 @@ class ResourceClass(Model, Notify):
                 sparql += hp.prop.create_owl_part1(timestamp, indent + 2) + '\n'
 
         sparql += f'{blank:{(indent + 2) * indent_inc}}{self._owlclass_iri} rdf:type owl:Class ;\n'
-        sparql += f'{blank:{(indent + 3) * indent_inc}}dcterms:hasVersion {self.__version.toRdf} ;\n'
+        sparql += f'{blank:{(indent + 3) * indent_inc}}schema:version {self.__version.toRdf} ;\n'
         sparql += f'{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf} ;\n'
         sparql += f'{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._creator.toRdf} ;\n'
         sparql += f'{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf} ;\n'

oldaplib-0.2.10/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.2.10"

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/test/test_connection.py

@@ -177,7 +177,7 @@ class TestBasicConnection(unittest.TestCase):
             Iri("sh:property"): Xsd_QName("test:testShape"),
             Iri("sh:closed"): Xsd_boolean(True),
             Iri("sh:targetClass"): Xsd_QName("test:testMyRes"),
-            Iri("dcterms:hasVersion"): '1.0.0',
+            Iri("schema:version"): '1.0.0',
             Iri("dcterms:creator"): Iri("https://orcid.org/0000-0003-1681-4036"),
             Iri("dcterms:created"): Xsd_dateTime(datetime(2023, 11, 4, 12, 0, tzinfo=timezone.utc)),
             Iri("dcterms:contributor"):  Iri("https://orcid.org/0000-0003-1681-4036"),

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/test/test_datamodel.py

@@ -48,6 +48,7 @@ class TestDataModel(unittest.TestCase):
     _project: Project
     _dmproject: Project
     _sysproject: Project
+    _sharedproject: Project
 
     @classmethod
     def setUp(cls):
@@ -114,6 +115,7 @@ class TestDataModel(unittest.TestCase):
         cls._dmprojectH = Project.read(cls._connection, "dmtestH", ignore_cache=True)
         cls._dmprojectI = Project.read(cls._connection, "dmtestI", ignore_cache=True)
         cls._sysproject = Project.read(cls._connection, "oldap", ignore_cache=True)
+        cls._sharedproject = Project.read(cls._connection, "shared", ignore_cache=True)
 
 
     def tearDown(self):
@@ -380,7 +382,9 @@ class TestDataModel(unittest.TestCase):
             Iri("dcterms:accessRights"),
             Iri("schema:givenName"),
             Iri("schema:familyName"),
-            Iri("schema:email")
+            Iri("schema:email"),
+            Iri("oldap:hasAdminPermission"),
+            Iri("oldap:statementProperty")
         })
         self.assertEqual(set(model.get_resclasses()), {
             Iri("oldap:Project"),
@@ -391,9 +395,13 @@ class TestDataModel(unittest.TestCase):
             Iri("oldap:DataPermission"),
             Iri("oldap:PermissionSet"),
             Iri("oldap:Thing"),
-            Iri("oldap:OldapChronolgyStatement")
+            Iri("oldap:OldapChronolgyStatement"),
+            Iri("oldap:inProjectStatement")
         })
 
+    def test_datamodel_read_shared(self):
+        model = DataModel.read(self._connection, self._sharedproject, ignore_cache=True)
+
     def test_datamodel_cache(self):
         start = time()
         model = DataModel.read(self._connection, self._sysproject, ignore_cache=True)

{oldaplib-0.2.9 → oldaplib-0.2.10}/oldaplib/test/test_propertyclass.py

@@ -91,6 +91,20 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p.get(PropClassAttr.NAME), LangString(["Test property@en", "Testprädikat@de"]))
         self.assertEqual(p.get(PropClassAttr.DESCRIPTION), LangString("A property for testing...@en", "Property für Tests@de"))
 
+    def test_star_propertyclass_constructor(self):
+        p = PropertyClass(con=self._connection,
+                          project=self._project,
+                          property_class_iri=Iri('test:testpropstar'),
+                          statement_property=True,
+                          datatype=XsdDatatypes.string,
+                          name=LangString(["Test property@en", "Testprädikat@de"]),
+                          description={"A property for testing...@en", "Property für Tests@de"})
+        self.assertEqual(p.property_class_iri, Iri('test:testpropstar'))
+        self.assertTrue(p.statementProperty)
+        self.assertEqual(p.get(PropClassAttr.DATATYPE), XsdDatatypes.string)
+        self.assertEqual(p.get(PropClassAttr.NAME), LangString(["Test property@en", "Testprädikat@de"]))
+        self.assertEqual(p.get(PropClassAttr.DESCRIPTION), LangString("A property for testing...@en", "Property für Tests@de"))
+
     def test_propertyclass_inset_datatypes(self):
         p = PropertyClass(con=self._connection,
                           project=self._project,
@@ -266,7 +280,7 @@ class TestPropertyClass(unittest.TestCase):
                          RdfSet({Xsd_string("very good"), Xsd_string("good"), Xsd_string("fair"), Xsd_string("insufficient")}))
 
     # @unittest.skip('Work in progress')
-    def test_propertyclass_create(self):
+    def test_propertyclass_create_A(self):
         p1 = PropertyClass(
             con=self._connection,
             project=self._project,
@@ -288,6 +302,7 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p1[PropClassAttr.IN],
                          RdfSet(Iri("http://www.test.org/comment1"), Iri("http://www.test.org/comment2")))
 
+    def test_propertyclass_create_B(self):
         p2 = PropertyClass(
             con=self._connection,
             project=self._project,
@@ -309,6 +324,7 @@ class TestPropertyClass(unittest.TestCase):
         self.assertEqual(p2[PropClassAttr.LANGUAGE_IN],
                          LanguageIn(Language.EN, Language.DE, Language.FR, Language.IT))
 
+    def test_propertyclass_create_C(self):
         p3 = PropertyClass(
             con=self._connection,
             project=self._project,
@@ -323,7 +339,7 @@ class TestPropertyClass(unittest.TestCase):
                                 ignore_cache=True)
         self.assertEqual(p3.pattern, r"^[\w\.-]+@[a-zA-Z\d-]+(\.[a-zA-Z\d-]+)*\.[a-zA-Z]{2,}$")
 
-
+    def test_propertyclass_create_D(self):
         pX = PropertyClass(
             con=self._connection,
             #graph=Xsd_NCName('test'),
@@ -335,6 +351,22 @@ class TestPropertyClass(unittest.TestCase):
             pX.create()
         self.assertEqual(str(ex.exception), 'Property "test:testWrite" already exists.')
 
+    def test_propertyclass_create_E(self):
+        p = PropertyClass(
+            con=self._connection,
+            project=self._project,
+            property_class_iri=Iri('test:testWriteStar'),
+            statement_property=True,
+            datatype=XsdDatatypes.string,
+        )
+        p.create()
+        p = PropertyClass.read(con=self._connection,
+                                project=self._project,
+                                property_class_iri=Iri('test:testWriteStar'),
+                                ignore_cache=True)
+        self.assertTrue(p.statementProperty)
+        self.assertEqual(p.get(PropClassAttr.DATATYPE), XsdDatatypes.string)
+
     def test_propertyclass_create_nopermission(self):
         p1 = PropertyClass(
             con=self._unpriv,