oldaplib 0.3.14__py3-none-any.whl → 0.3.15__py3-none-any.whl

oldaplib/src/enums/propertyclassattr.py

@@ -57,7 +57,7 @@ class PropClassAttr(AttributeClass):
     LESS_THAN = ('sh:lessThan', False, False, Iri, Target.SHACL)
     LESS_THAN_OR_EQUALS = ('sh:lessThanOrEquals', False, False, Iri, Target.SHACL)
     INVERSE_OF = ('owl:inverseOf', False, False, Xsd_QName, Target.OWL)
-    EQUIVALEND_PROPERTY = ('owl:equivalentProperty', False, False, Xsd_QName, Target.OWL)
+    EQUIVALENT_PROPERTY = ('owl:equivalentProperty', False, False, Xsd_QName, Target.OWL)
 
 
     @classmethod

oldaplib/src/hasproperty.py

@@ -6,9 +6,10 @@ from typing import Callable, Self, Any
 from oldaplib.src.enums.action import Action
 from oldaplib.src.enums.attributeclass import AttributeClass
 from oldaplib.src.enums.haspropertyattr import HasPropertyAttr
+from oldaplib.src.enums.owlpropertytype import OwlPropertyType
 from oldaplib.src.helpers.Notify import Notify
 from oldaplib.src.helpers.irincname import IriOrNCName
-from oldaplib.src.helpers.oldaperror import OldapErrorNotFound
+from oldaplib.src.helpers.oldaperror import OldapErrorNotFound, OldapErrorInconsistency
 from oldaplib.src.helpers.serializer import serializer
 from oldaplib.src.iconnection import IConnection
 from oldaplib.src.model import Model
@@ -117,6 +118,25 @@ class HasProperty(Model, Notify):
                     self._type = PropType.INTERNAL
         self.set_attributes(kwargs, HasPropertyAttr)
 
+        #
+        # Check consistency for owl:FunctionalProperty. It must have a maxCount=1
+        #
+        if isinstance(self._prop, PropertyClass) and OwlPropertyType.FunctionalProperty in self._prop.type:
+            if not self._attributes.get(HasPropertyAttr.MAX_COUNT):
+                raise OldapErrorInconsistency(f'FunctionalProperty {self._prop.property_class_iri} must have maxCount=1')
+            if self._attributes[HasPropertyAttr.MAX_COUNT] != 1:
+                raise OldapErrorInconsistency(f'FunctionalProperty {self._prop.property_class_iri} must have maxCount=1')
+
+        #
+        # Check consistency for owl:InverseFunctionalProperty. It must have a cardinality of 1..1
+        #
+        if isinstance(self._prop, PropertyClass) and OwlPropertyType.InverseFunctionalProperty in self._prop.type:
+            if not self._attributes.get(HasPropertyAttr.MIN_COUNT) or not self._attributes.get(HasPropertyAttr.MAX_COUNT):
+                raise OldapErrorInconsistency(f'InverseFunctionalProperty {self._prop.property_class_iri} must have cardinality=1..1')
+            if self._attributes[HasPropertyAttr.MIN_COUNT] != 1 or self._attributes[HasPropertyAttr.MAX_COUNT] != 1:
+                raise OldapErrorInconsistency(f'InverseFunctionalProperty {self._prop.property_class_iri} must have cardinality=1..1')
+
+
         for attr in HasPropertyAttr:
             setattr(HasProperty, attr.value.fragment, property(
                 partial(HasProperty._get_value, attr=attr),

oldaplib/src/propertyclass.py

@@ -184,7 +184,7 @@ class PropertyClass(Model, Notify):
     __slots__ = ('subPropertyOf', 'type', 'toClass', 'datatype', 'name', 'description', 'languageIn', 'uniqueLang',
                  'inSet', 'minCount', 'maxCount', 'pattern',
                  'minExclusive', 'maxExclusive', 'minInclusive', 'maxInclusive', 'minLength', 'maxLength',
-                 'lessThan', 'lessThanOrEqual')
+                 'lessThan', 'lessThanOrEqual', 'inverseOf', 'equivalentProperty')
 
 
     def __init__(self, *,
@@ -321,10 +321,14 @@ class PropertyClass(Model, Notify):
         if self._statementProperty:
             self._attributes[PropClassAttr.TYPE].add(OwlPropertyType.StatementProperty)
         if self._attributes.get(PropClassAttr.CLASS) is not None:
+            if OwlPropertyType.OwlDataProperty in self._attributes[PropClassAttr.TYPE]:
+                raise OldapErrorInconsistency(f'Property {self._property_class_iri} cannot be both a link property and a data property.')
             self._attributes[PropClassAttr.TYPE].add(OwlPropertyType.OwlObjectProperty)
             if self._attributes.get(PropClassAttr.DATATYPE) is not None:
                 raise OldapError(f'Datatype "{self._attributes.get(PropClassAttr.DATATYPE)}" not possible for OwlObjectProperty')
         elif self._attributes.get(PropClassAttr.DATATYPE) is not None:
+            if OwlPropertyType.OwlObjectProperty in self._attributes[PropClassAttr.TYPE]:
+                raise OldapErrorInconsistency(f'Property {self._property_class_iri} cannot be both a link property and a data property.')
             self._attributes[PropClassAttr.TYPE].add(OwlPropertyType.OwlDataProperty)
 
         #

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.14"
+__version__ = "0.3.15"

oldaplib/test/test_propertyclass.py

@@ -14,6 +14,7 @@ from oldaplib.src.enums.action import Action
 from oldaplib.src.enums.language import Language
 from oldaplib.src.enums.propertyclassattr import PropClassAttr
 from oldaplib.src.enums.xsd_datatypes import XsdDatatypes
+from oldaplib.src.hasproperty import HasProperty
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.helpers.langstring import LangString, LangStringChange
 from oldaplib.src.helpers.observable_set import ObservableSet
@@ -252,15 +253,31 @@ class TestPropertyClass(unittest.TestCase):
         p4.update()
         self.assertEqual(p4.get(PropClassAttr.TYPE), {OwlPropertyType.SymmetricProperty, OwlPropertyType.TransitiveProperty, OwlPropertyType.OwlDataProperty})
 
-    def test_propertyclass_inconsistent_constructor(self):
+    def test_propertyclass_inconsistent_constructor_A(self):
         with self.assertRaises(OldapErrorValue):
             p5 = PropertyClass(con=self._connection,
                                project=self._project,
-                               property_class_iri=Xsd_QName('test:testprop5'),
+                               property_class_iri=Xsd_QName('test:testprop5a'),
                                datatype=XsdDatatypes.string,
                                languageIn=LanguageIn(Language.EN, Language.DE, Language.FR))
 
-    def test_propertyclass_invalid_constructor(self):
+    def test_propertyclass_inconsistent_constructor_B(self):
+        with self.assertRaises(OldapErrorInconsistency):
+            p5 = PropertyClass(con=self._connection,
+                               project=self._project,
+                               type={OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlObjectProperty},
+                               property_class_iri=Xsd_QName('test:testprop5b'),
+                               datatype=XsdDatatypes.string)
+
+    def test_propertyclass_inconsistent_constructor_C(self):
+        with self.assertRaises(OldapErrorInconsistency):
+            p5 = PropertyClass(con=self._connection,
+                               project=self._project,
+                               type={OwlPropertyType.SymmetricProperty, OwlPropertyType.OwlDataProperty},
+                               property_class_iri=Xsd_QName('test:testprop5c'),
+                               toClass=Xsd_QName('test:comment'))
+
+    def test_propertyclass_invalid_constructor_A(self):
         with self.assertRaises(OldapErrorInconsistency):
             px = PropertyClass(con=self._connection,
                                project=self._project,
@@ -268,6 +285,38 @@ class TestPropertyClass(unittest.TestCase):
                                toClass=Xsd_QName('test:comment'),
                                minLength=42)
 
+    def test_propertyclass_invalid_constructor_B(self):
+        px = PropertyClass(con=self._connection,
+                           project=self._project,
+                           type={OwlPropertyType.SymmetricProperty, OwlPropertyType.FunctionalProperty},
+                           property_class_iri=Xsd_QName('test:testpropBa'),
+                           toClass=Xsd_QName('test:comment'))
+        hp = HasProperty(con=self._connection, project=self._project, prop=px, maxCount=1)
+
+        with self.assertRaises(OldapErrorInconsistency):
+            px = PropertyClass(con=self._connection,
+                               project=self._project,
+                               type={OwlPropertyType.SymmetricProperty, OwlPropertyType.FunctionalProperty},
+                               property_class_iri=Xsd_QName('test:testpropBb'),
+                               toClass=Xsd_QName('test:comment'))
+            hp = HasProperty(con=self._connection, project=self._project, prop=px)
+
+    def test_propertyclass_invalid_constructor_C(self):
+        px = PropertyClass(con=self._connection,
+                           project=self._project,
+                           type={OwlPropertyType.SymmetricProperty, OwlPropertyType.InverseFunctionalProperty},
+                           property_class_iri=Xsd_QName('test:testpropC'),
+                           toClass=Xsd_QName('test:comment'))
+        hp = HasProperty(con=self._connection, project=self._project, prop=px, minCount=1, maxCount=1)
+
+        with self.assertRaises(OldapErrorInconsistency):
+            px = PropertyClass(con=self._connection,
+                               project=self._project,
+                               type={OwlPropertyType.SymmetricProperty, OwlPropertyType.InverseFunctionalProperty},
+                               property_class_iri=Xsd_QName('test:testpropC'),
+                               toClass=Xsd_QName('test:comment'))
+            hp = HasProperty(con=self._connection, project=self._project, prop=px)
+
     def test_propertyclass_projectsn_constructor(self):
         p6 = PropertyClass(con=self._connection,
                            project="test",

{oldaplib-0.3.14.dist-info → oldaplib-0.3.15.dist-info}/METADATA

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

{oldaplib-0.3.14.dist-info → oldaplib-0.3.15.dist-info}/RECORD

@@ -30,14 +30,14 @@ oldaplib/src/enums/oldaplistnodeattr.py,sha256=qokSxE-0FLyWNipjjY3gZJC2bBEt1qS1Z
 oldaplib/src/enums/owlpropertytype.py,sha256=R7DaCV4vtkGeuDhslN3q7719J1sLKUL-x0o91Te7Qk8,989
 oldaplib/src/enums/permissionsetattr.py,sha256=og4jPvbY86ABr_I9qIvhvg4iIiQCFMcv9-_0D2gfzz8,839
 oldaplib/src/enums/projectattr.py,sha256=A_iayrT3Sd1L_guhHtCKSlUaVf9JqikRXqML-GHkJ3o,1173
-oldaplib/src/enums/propertyclassattr.py,sha256=92R_rVdG-xAWLsRqFknuyKIwLXI-g8gTszL_x9cGNVk,4263
+oldaplib/src/enums/propertyclassattr.py,sha256=-F5Pjqj1AAnCrC01en-gGD4M-QoIYbi5QAWL0jQmNVQ,4263
 oldaplib/src/enums/resourceclassattr.py,sha256=g8tc5JDr4wLCteBNnhHMVE4cRZOhlSQqs-qFnRB3_N0,709
 oldaplib/src/enums/sparql_result_format.py,sha256=MLBHKY25o96mswSWioR-rS__zP6kPzYGNIWLZCr9784,636
 oldaplib/src/enums/userattr.py,sha256=ZRBGGLP5NMvyAER893TzRjfkhZk4jOtS9RsSkYsQM-c,1628
 oldaplib/src/enums/xsd_datatypes.py,sha256=TGpy2TEaYfmCsSCClSyK76ixNP_hR7nEdJvCT6l-Txk,6253
 oldaplib/src/externalontology.py,sha256=VaQvVlq5muzmQ466c1gKrldXn9Wx_WfOR7pUCjw_cYw,23888
 oldaplib/src/globalconfig.py,sha256=zAJmAMQnojbhj8SZFUaPj7DIHN5g3wUwQQhWPMxjDUg,1306
-oldaplib/src/hasproperty.py,sha256=VnjLa6VBIH---mwh1mJ_drisDqjPu7By1RhFAVZaT7k,15814
+oldaplib/src/hasproperty.py,sha256=w2rNuhqyWdJYAXnGROFLZUyafCpznPv-h_XuQSFWbqs,17235
 oldaplib/src/helpers/Notify.py,sha256=9zzO93F4V4lj-xF6b3hpRg1QkI4TR_GYEh3ptsohlfQ,2008
 oldaplib/src/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/helpers/attributechange.py,sha256=aQ5Q9s6U3bVd1WSNQcBpkr5UQVxeP4z_uz0K5_31ZVc,256
@@ -66,11 +66,11 @@ oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA
 oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,1242
 oldaplib/src/permissionset.py,sha256=bzzVuZ7O_yVMujziwo32GEJIZYGG3g5gTds4HjLmGtU,31874
 oldaplib/src/project.py,sha256=DNwViRg19zkE1F0zuWqQFK008uTVehVAu7xNbyessig,34207
-oldaplib/src/propertyclass.py,sha256=WcRz-yzNOenyTWsYHkh48vaJDFO_0AgH9AMFq-HsiVo,93777
+oldaplib/src/propertyclass.py,sha256=feWze8I0FxIgXGCn0jlBMVu69xULj43KIceP8GL0J9s,94266
 oldaplib/src/resourceclass.py,sha256=I6m93JhfCh4XAUFgmb6v0fD798DfU7-ImTKrUJk4g-o,102098
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=-T6106A_Mf7BT-0-rzDMc_1EaoZP74bXWfYSnwUgJCg,22
+oldaplib/src/version.py,sha256=gfCyWXKIm8Pcp9T835VgQrEZyolnHdfkmrdCNFY3zyg,22
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -134,7 +134,7 @@ oldaplib/test/test_oldaplist_helpers.py,sha256=vJkA_Txhdk4oIwo2YK566yOte2Z6MQksh
 oldaplib/test/test_oldaplistnode.py,sha256=bWoCmDmHvOnNNviSCvhWo7LA2CskA_5IRDxNUufTKj4,149434
 oldaplib/test/test_permissionset.py,sha256=YOCirqm_oFE1Emz9fYsnDeawwI6zHN9xBv9vOZnKst0,23368
 oldaplib/test/test_project.py,sha256=fwkfaCxEskd27xinxDDr74dMWs7S0YcGr84mUOw20x4,25290
-oldaplib/test/test_propertyclass.py,sha256=67Kw5cDlPzRNm20bqz1QB-8PXFpV5iQy8Jza1epLXxk,53293
+oldaplib/test/test_propertyclass.py,sha256=pOXTnJphYU3stlqXgGJK5Z3mUJ26C27X_FRc00Aj4qY,56310
 oldaplib/test/test_resourceclass.py,sha256=WQGyns2S8O6vDH8oXBQjcww_VcjIONovuNdKm0coO-c,96621
 oldaplib/test/test_semantic_version.py,sha256=OSJYHWDpKBqk-HsxJ2nFpSr14a4OEZTFCogzEni8mcE,3392
 oldaplib/test/test_user.py,sha256=gLTcQ0ymi9pYPPpq9BOY_3YS07EJXtnJKFCHe4Rj0mQ,72133
@@ -158,6 +158,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.3.14.dist-info/METADATA,sha256=UJPy5L_UvfLyY8TbVdWFTXKTHHdPdDNuVwUEG7ElRCo,3061
-oldaplib-0.3.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-oldaplib-0.3.14.dist-info/RECORD,,
+oldaplib-0.3.15.dist-info/METADATA,sha256=XhFAj7WMCjQDXGb-d-a1l2oWZNqu5TX49cn_fHW1ZAI,3061
+oldaplib-0.3.15.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+oldaplib-0.3.15.dist-info/RECORD,,