oldaplib 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

oldaplib/src/objectfactory.py

@@ -72,7 +72,7 @@ class ResourceInstance:
     :type changeset: dict[Iri, AttributeChange]
     """
     _iri: Iri
-    _values: dict[Iri, LangString | ObservableSet]
+    _values: dict[Xsd_QName, LangString | ObservableSet]
     _graph: Xsd_NCName
     _changeset: dict[Iri, AttributeChange]
 
@@ -104,7 +104,7 @@ class ResourceInstance:
         self._superclass_objs = {}
         self._changeset = {}
 
-        def set_values(propclass: dict[Iri, HasProperty]):
+        def set_values(propclass: dict[Xsd_QName, HasProperty]):
             for prop_iri, hasprop in propclass.items():
                 if kwargs.get(str(prop_iri)) or kwargs.get(prop_iri.fragment):
                     value = kwargs[str(prop_iri)] if kwargs.get(str(prop_iri)) else kwargs[prop_iri.fragment]
@@ -143,20 +143,20 @@ class ResourceInstance:
                         else:
                             self.validate_value(self._values[prop_iri], hasprop.prop)
 
-        def process_superclasses(superclass: dict[Iri, ResourceClass]):
+        def process_superclasses(superclass: dict[Xsd_QName, ResourceClass]):
            for sc_iri, sc in superclass.items():
                 if sc.superclass:
                     process_superclasses(sc.superclass)
-                if sc.owl_class_iri == Iri("oldap:Thing", validate=False):
+                if sc.owl_class_iri == Xsd_QName("oldap:Thing", validate=False):
                     timestamp = Xsd_dateTimeStamp()
-                    if not self._values.get(Iri('oldap:createdBy', validate=False)):
-                        self._values[Iri('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
-                    if not self._values.get(Iri('oldap:creationDate', validate=False)):
-                        self._values[Iri('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
-                    if not self._values.get(Iri('oldap:lastModifiedBy', validate=False)):
-                        self._values[Iri('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
-                    if not self._values.get(Iri('oldap:lastModificationDate', validate=False)):
-                        self._values[Iri('oldap:lastModificationDate', validate=False)] = ObservableSet({timestamp})
+                    if not self._values.get(Xsd_QName('oldap:createdBy', validate=False)):
+                        self._values[Xsd_QName('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
+                    if not self._values.get(Xsd_QName('oldap:creationDate', validate=False)):
+                        self._values[Xsd_QName('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
+                    if not self._values.get(Xsd_QName('oldap:lastModifiedBy', validate=False)):
+                        self._values[Xsd_QName('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
+                    if not self._values.get(Xsd_QName('oldap:lastModificationDate', validate=False)):
+                        self._values[Xsd_QName('oldap:lastModificationDate', validate=False)] = ObservableSet({timestamp})
                 set_values(sc.properties)
                 for iri, prop in sc.properties.items():
                     self.properties[iri] = prop
@@ -289,7 +289,7 @@ class ResourceInstance:
                     raise OldapErrorInconsistency(
                         f'Property {property} with LESS_THAN={property[PropClassAttr.LESS_THAN_OR_EQUALS]} has invalid value: "{max_value}" NOT LESS_THAN "{min_other_value}".')
 
-    def notifier(self, prop_iri: Iri):
+    def notifier(self, prop_iri: Xsd_QName):
         hasprop = self.properties[prop_iri]
         self.validate_value(self._values[prop_iri], hasprop)
 
@@ -329,14 +329,14 @@ class ResourceInstance:
                 return False, f'Actor does not have {permission} in project "{self.project.projectShortName}".'
 
     def __get_value(self: Self, prefix: str, fragment: str) -> Xsd | ValueType | None:
-        attr = Iri(Xsd_QName(prefix, fragment, validate=False), validate=False)
+        attr = Xsd_QName(prefix, fragment, validate=False)
         tmp = self._values.get(attr, None)
         if tmp is not None and str(attr) in {'oldap:createdBy', 'oldap:creationDate', 'oldap:lastModifiedBy', 'oldap:lastModificationDate'}:
             return next(iter(tmp))
         return tmp
 
     def __set_value(self: Self, value: ValueType | Xsd | None, prefix: str, fragment: str) -> None:
-        prop_iri = Iri(Xsd_QName(prefix, fragment, validate=False), validate=False)
+        prop_iri = Xsd_QName(prefix, fragment, validate=False)
         hasprop = self.properties.get(prop_iri)
 
         #
@@ -388,7 +388,7 @@ class ResourceInstance:
                 self._values[prop_iri] = convert2datatype(value, hasprop.prop.datatype)
 
     def __del_value(self: Self, prefix: str, fragment: str) -> None:
-        prop_iri = Iri(Xsd_QName(prefix, fragment, validate=False), validate=False)
+        prop_iri = Xsd_QName(prefix, fragment, validate=False)
         hasprop = self.properties.get(prop_iri)
 
         if hasprop.get(HasPropertyAttr.MIN_COUNT):  # testing for MIN_COUNT conformance
@@ -396,7 +396,7 @@ class ResourceInstance:
                 raise OldapErrorValue(f'{self.name}: Property {prop_iri} with MIN_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} cannot be deleted.')
 
         self._changeset[prop_iri] = AttributeChange(self._values.get(prop_iri), Action.DELETE)
-        attr = Iri(Xsd_QName(prefix, fragment, validate=False), validate=False)
+        attr = Xsd_QName(prefix, fragment, validate=False)
         del self._values[attr]
 
     @property
@@ -404,7 +404,7 @@ class ResourceInstance:
         return self._iri
 
     @property
-    def changeset(self) -> dict[Iri, AttributeChange]:
+    def changeset(self) -> dict[Xsd_QName, AttributeChange]:
         return self._changeset
 
     def clear_changeset(self) -> None:
@@ -451,10 +451,10 @@ class ResourceInstance:
 
         timestamp = Xsd_dateTimeStamp()
         if self.name == "Thing":
-            self._values[Iri('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
-            self._values[Iri('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
-            self._values[Iri('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
-            self._values[Iri('oldap:lastModificationDate', validate=False)] = ObservableSet({timestamp})
+            self._values[Xsd_QName('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
+            self._values[Xsd_QName('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
+            self._values[Xsd_QName('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
+            self._values[Xsd_QName('oldap:lastModificationDate', validate=False)] = ObservableSet({timestamp})
 
         indent: int = 0
         indent_inc: int = 4

oldaplib/src/oldaplist.py

@@ -383,7 +383,7 @@ class OldapList(Model):
         last_nodeiri = None
         for r in res:
             nodeiri = r['node']
-            if last_nodeiri != nodeiri:
+            if last_nodeiri is None or last_nodeiri != nodeiri:
                 prefix, id = str(nodeiri).split(':')
                 ln = OldapListNode(con=self._con,
                                    **self.info,

oldaplib/src/permissionset.py

@@ -55,7 +55,7 @@ class PermissionSet(Model):
     :type iri: Iri
     """
 
-    __permset_iri: Iri | None
+    __permset_iri: Xsd_QName | None
     __project: Project | None
 
     def __init__(self, *,
@@ -112,7 +112,8 @@ class PermissionSet(Model):
         # The IRI of the permission set is a QName consisting of the prefix of the project (aka projectShortname)
         # and the permissionSetId. Thus, the same permission set ID could be used in different projects...
         #
-        self.__permset_iri = Iri.fromPrefixFragment(self.__project.projectShortName, self._attributes[PermissionSetAttr.PERMISSION_SET_ID], validate=False)
+        self.__permset_iri = Xsd_QName(self.__project.projectShortName, self._attributes[PermissionSetAttr.PERMISSION_SET_ID])
+        #self.__permset_iri = Iri.fromPrefixFragment(self.__project.projectShortName, self._attributes[PermissionSetAttr.PERMISSION_SET_ID], validate=False)
 
         for attr in PermissionSetAttr:
             setattr(PermissionSet, attr.value.fragment, property(
@@ -182,7 +183,11 @@ class PermissionSet(Model):
         self._changeset[what] = AttributeChange(None, Action.MODIFY)
 
     @property
-    def iri(self) -> Iri:
+    def iri(self) -> Xsd_QName:
+        return self.__permset_iri
+
+    @property
+    def qname(self) -> Xsd_QName:
         return self.__permset_iri
 
     def create(self, indent: int = 0, indent_inc: int = 4) -> None:
@@ -274,7 +279,7 @@ class PermissionSet(Model):
     @classmethod
     def read(cls, *,
              con: IConnection,
-             iri: Iri | str | None = None,
+             qname: Xsd_QName | str | None = None,
              permissionSetId: Xsd_NCName | str | None = None,
              definedByProject: Project | Iri | Xsd_NCName | str | None = None,
              ignore_cache: bool = False) -> Self:
@@ -284,7 +289,7 @@ class PermissionSet(Model):
         an instance of the permission set if found.
 
         :param con: The connection object used to interact with the system.
-        :param iri: The Internationalized Resource Identifier of the permission set. If provided,
+        :param qname: The Internationalized Resource Identifier of the permission set. If provided,
                     it will be used to read the permission set.
         :param permissionSetId: The unique identifier of the permission set within a project.
                                 Required if `iri` is not provided.
@@ -302,8 +307,8 @@ class PermissionSet(Model):
         :raises OldapErrorInconsistency: Raised if the permission set contains inconsistencies
                                          in its data during retrieval.
         """
-        if iri:
-            permset_iri = Iri(iri, validate=True)
+        if qname:
+            permset_iri = Xsd_QName(qname, validate=True)
         elif permissionSetId and definedByProject:
             id = Xsd_NCName(permissionSetId, validate=True)
 
@@ -311,7 +316,7 @@ class PermissionSet(Model):
                 project = definedByProject
             else:
                 project = Project.read(con, definedByProject)
-            permset_iri = Iri.fromPrefixFragment(project.projectShortName, permissionSetId, validate=False)
+            permset_iri = Xsd_QName(project.projectShortName, permissionSetId)
         else:
             raise OldapErrorValue('Either the parameter "iri" of both "permissionSetId" and "definedByProject" must be provided.')
         if not ignore_cache:
@@ -336,7 +341,7 @@ class PermissionSet(Model):
         if len(res) == 0:
             raise OldapErrorNotFound(f'No permission set "{permset_iri}"')
 
-        permset_iri: Iri | None = None
+        permset_iri: Xsd_QName | None = None
         creator: Iri | None = None
         created: Xsd_dateTime | None = None
         contributor: Iri | None = None
@@ -470,7 +475,7 @@ class PermissionSet(Model):
         sparql += '}\n'
         jsonobj = con.query(sparql)
         res = QueryProcessor(context, jsonobj)
-        permissionSets: list[Iri] = []
+        permissionSets: list[Xsd_QName] = []
         for r in res:
             if definedByProject:
                 #context[r['projectShortName']] = r['namespaceIri']

oldaplib/src/propertyclass.py

@@ -58,18 +58,18 @@ from oldaplib.src.model import Model
 from oldaplib.src.helpers.attributechange import AttributeChange
 from oldaplib.src.xsd.xsd_string import Xsd_string
 
-PropTypes = Iri | OwlPropertyType | XsdDatatypes | LangString | Xsd_string | Xsd_integer | Xsd_boolean | LanguageIn | XsdSet | Numeric | None
+PropTypes = Iri | Xsd_QName | OwlPropertyType | XsdDatatypes | LangString | Xsd_string | Xsd_integer | Xsd_boolean | LanguageIn | XsdSet | Numeric | None
 PropClassAttrContainer = dict[PropClassAttr, PropTypes]
-Attributes = dict[Iri, PropTypes]
+Attributes = dict[Xsd_QName, PropTypes]
 
 @dataclass
 @serializer
 class HasPropertyData:
-    refprop: Iri | None = None
+    refprop: Xsd_QName | None = None
     minCount: Xsd_nonNegativeInteger | None = None
     maxCount: Xsd_nonNegativeInteger | None = None
     order: Xsd_decimal | None = None
-    group: Iri | None = None
+    group: Xsd_QName | None = None
 
     def create_shacl(self, indent: int = 0, indent_inc: int = 4):
         blank = ''
@@ -161,10 +161,10 @@ class PropertyClass(Model, Notify):
     _graph: Xsd_NCName
     _projectShortName: Xsd_NCName
     _projectIri: Iri
-    _property_class_iri: Iri | None
+    _property_class_iri: Xsd_QName | None
     _statementProperty: Xsd_boolean
     _externalOntology: Xsd_boolean
-    _internal: Iri | None
+    _internal: Xsd_QName | None
     _force_external: bool
     #_attributes: PropClassAttrContainer
     _test_in_use: bool
@@ -190,12 +190,12 @@ class PropertyClass(Model, Notify):
                  contributor: Iri | None = None,
                  modified: Xsd_dateTime | datetime | str | None = None,
                  project: Project | Iri | Xsd_NCName | str,
-                 property_class_iri: Iri | str | None = None,
+                 property_class_iri: Xsd_QName | str | None = None,
                  notifier: Callable[[PropClassAttr], None] | None = None,
                  notify_data: PropClassAttr | None = None,
                  _statementProperty: bool | Xsd_boolean= False,
                  _externalOntology: bool | Xsd_boolean = False,
-                 _internal: Iri | None = None,  # DO NOT USE!! Only for serialization!
+                 _internal: Xsd_QName | None = None,  # DO NOT USE!! Only for serialization!
                  _force_external: bool | None = None,  # DO NOT USE!! Only for serialization!
                  _from_triplestore: bool = False,
                  validate: bool = False,
@@ -267,7 +267,7 @@ class PropertyClass(Model, Notify):
         context.use(self._projectShortName)
         self._graph = self._projectShortName
 
-        self._property_class_iri = Iri(property_class_iri, validate=validate) if property_class_iri else None
+        self._property_class_iri = Xsd_QName(property_class_iri, validate=validate) if property_class_iri else None
         datatype = kwargs.get('datatype', None)
         if datatype and kwargs.get('inSet'):
             if datatype == XsdDatatypes.langString:
@@ -535,7 +535,7 @@ class PropertyClass(Model, Notify):
         return self._projectIri
 
     @property
-    def property_class_iri(self) -> Iri:
+    def property_class_iri(self) -> Xsd_QName:
         """
         Return the Iri identifying the property
         :return: Iri identifying the property
@@ -553,7 +553,7 @@ class PropertyClass(Model, Notify):
         return self.__version
 
     @property
-    def internal(self) -> Iri | None:
+    def internal(self) -> Xsd_QName | None:
         """
         Return the Iri of the ResourceClass, if the property is internal to a ResourceClass.
         If it is a standalone property, return None
@@ -685,7 +685,7 @@ class PropertyClass(Model, Notify):
                 return False
 
     @staticmethod
-    def process_triple(r: RowType, attributes: Attributes, propiri: Iri | None = None) -> None:
+    def process_triple(r: RowType, attributes: Attributes, propiri: Xsd_QName | None = None) -> None:
         """
         INTERNAL USE ONLY! Used for processing triple while rreading a property.
         :param r:
@@ -714,12 +714,11 @@ class PropertyClass(Model, Notify):
                     raise OldapError(f'Invalid value for attribute {attriri}: {err}.')
             else:
                 if attributes.get(attriri) is not None:
-                    print("===>", r)
                     raise OldapError(f'Property ({propiri}) attribute "{attriri}" already defined (value="{r['value']}", type="{type(r['value']).__name__}").')
                 attributes[attriri] = r['value']
 
     @staticmethod
-    def __query_shacl(con: IConnection, graph: Xsd_NCName, property_class_iri: Iri) -> Attributes:
+    def __query_shacl(con: IConnection, graph: Xsd_NCName, property_class_iri: Xsd_QName) -> Attributes:
         context = Context(name=con.context_name)
         query = context.sparql_context
         query += f"""
@@ -751,22 +750,22 @@ class PropertyClass(Model, Notify):
         #
         # Create a set of all PropertyClassProp-strings, e.g. {"sh:path", "sh:datatype" etc.}
         #
-        refprop: Iri | None = None
+        refprop: Xsd_QName | None = None
         minCount: Xsd_integer | None = None
         maxCount: Xsd_integer | None = None
         order: Xsd_decimal | None = None
-        group: Iri | None = None
-        propkeys = {Iri(x.value) for x in PropClassAttr}
+        group: Xsd_QName | None = None
+        propkeys = {Xsd_QName(x.value) for x in PropClassAttr}
         for key, val in attributes.items():
             if key == 'rdf:type':
                 if val != 'sh:PropertyShape':
                     raise OldapError(f'Inconsistency, expected "sh:PropertyType", got "{val}".')
                 continue
             elif key == 'sh:path':
-                if isinstance(val, Iri):
+                if isinstance(val, Xsd_QName):
                     self._property_class_iri = val
                 else:
-                    raise OldapError(f'Inconsistency in SHACL "sh:path" of "{self._property_class_iri}" ->"{val}"')
+                    raise OldapError(f'Inconsistency in SHACL "sh:path" of "{self._property_class_iri}" ->"{val}" (type={type(val).__name__}).')
             elif key == 'schema:version':
                 if isinstance(val, Xsd_string):
                     self.__version = SemanticVersion.fromString(str(val))
@@ -804,7 +803,7 @@ class PropertyClass(Model, Notify):
                     raise OldapError(f'Inconsistency in SHACL "oldap:externalOntology (type={type(val)}"')
             elif key == 'sh:node':
                 if str(val).endswith("Shape"):
-                    refprop = Iri(str(val)[:-5], validate=False)
+                    refprop = Xsd_QName(str(val)[:-5], validate=False)
                 else:
                     refprop = val
             elif key == 'sh:minCount':
@@ -816,7 +815,7 @@ class PropertyClass(Model, Notify):
             elif key == 'sh:group':
                 group = val
             elif key in propkeys:
-                attr = PropClassAttr.from_value(key.as_qname)
+                attr = PropClassAttr.from_value(key)
                 if attr.datatype == Numeric:
                     if not isinstance(val, (Xsd_integer, Xsd_float)):
                         raise OldapErrorInconsistency(f'SHACL inconsistency: "{attr.value}" expects a "Xsd:integer" or "Xsd:float", but got "{type(val).__name__}".')
@@ -923,7 +922,7 @@ class PropertyClass(Model, Notify):
     @classmethod
     def read(cls, con: IConnection,
              project: Project | Iri | Xsd_NCName | str,
-             property_class_iri: Iri | str,
+             property_class_iri: Xsd_QName | str,
              ignore_cache: bool = False) -> Self:
         """
         Reads a property from the triple store.
@@ -948,8 +947,8 @@ class PropertyClass(Model, Notify):
         """
         logger = get_logger()
 
-        if not isinstance(property_class_iri, Iri):
-            property_class_iri = Iri(property_class_iri)
+        if not isinstance(property_class_iri, Xsd_QName):
+            property_class_iri = Xsd_QName(property_class_iri)
         cache = CacheSingletonRedis()
         if not ignore_cache:
             tmp = cache.get(property_class_iri, connection=con)
@@ -1042,7 +1041,7 @@ class PropertyClass(Model, Notify):
 
     def create_shacl(self, *,
                      timestamp: Xsd_dateTime,
-                     owlclass_iri: Iri | None = None,
+                     owlclass_iri: Xsd_QName | None = None,
                      haspropdata: HasPropertyData | None = None,
                      indent: int = 0, indent_inc: int = 4) -> str:
         blank = ''
@@ -1255,7 +1254,7 @@ class PropertyClass(Model, Notify):
                 f.write(f'{blank:{indent * indent_inc}}}}\n')
 
     def update_shacl(self, *,
-                     owlclass_iri: Iri | None = None,
+                     owlclass_iri: Xsd_QName | None = None,
                      timestamp: Xsd_dateTime,
                      indent: int = 0, indent_inc: int = 4) -> str:
         blank = ''
@@ -1639,7 +1638,7 @@ class PropertyClass(Model, Notify):
         return sparql
 
     def delete_owl_subclass_str(self, *,
-                                owlclass_iri: Iri,
+                                owlclass_iri: Xsd_QName,
                                 indent: int = 0, indent_inc: int = 4) -> str:
         blank = ''
         sparql = ''