oldaplib 0.3.14__tar.gz → 0.3.15__tar.gz

{oldaplib-0.3.14 → oldaplib-0.3.15}/PKG-INFO

@@ -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 → oldaplib-0.3.15}/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-0.3.14 → oldaplib-0.3.15}/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-0.3.14 → oldaplib-0.3.15}/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-0.3.15/oldaplib/src/version.py

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

{oldaplib-0.3.14 → oldaplib-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 → oldaplib-0.3.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.14"
+version = "0.3.15"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.3.14/oldaplib/src/version.py

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