oldaplib 0.3.27__py3-none-any.whl → 0.3.28__py3-none-any.whl

oldaplib/ontologies/shared.trig

@@ -4,6 +4,7 @@
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix dcmitype: <http://purl.org/dc/dcmitype/> .
 @prefix schema: <http://schema.org/> .
 @prefix oldap: <http://oldap.org/base#> .
 
@@ -109,6 +110,90 @@ shared:shacl {
     # Media object
     ###############################################################################
 
+#    dcmitype:CollectionShape a sh:NodeShape ;
+#        sh:targetClass shared:Collection ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "Collection"@en, "Sammlung"@de, "Collection"@fr, "Collezione"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:DatasetShape a sh:NodeShape ;
+#        sh:targetClass shared:Dataset ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "Dataset"@en, "Dataset"@de, "Dataset"@fr, "Dataset"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:StillImageShape a sh:NodeShape ;
+#        sh:targetClass shared:StillImage ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "StillImage"@en, "Standbild"@de, "Image fixe"@fr, "Immagine fissa"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:ImageShape a sh:NodeShape ;
+#        sh:targetClass shared:Image ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "Image"@en, "Bild"@de, "Image"@fr, "Immagine"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:MovingImageShape a sh:NodeShape ;
+#        sh:targetClass shared:MovingImage ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "MovingImage"@en, "Bewegtbild"@de, "Image animée"@fr, "Immagine in movimento"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:SoundShape a sh:NodeShape ;
+#        sh:targetClass shared:Sound ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "Sound"@en, "Ton"@de, "Son"@fr, "Sound"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+#
+#    dcmitype:TextShape a sh:NodeShape ;
+#        sh:targetClass shared:Text ;
+#        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#        dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#        oldap:externalOntology "true"^^xsd:boolean ;
+#        rdfs:label "Text"@en, "Text"@de, "Texte"@fr, "Testo"@it ;
+#        sh:property [
+#            sh:path rdf:type ;
+#        ] .
+
     shared:MediaObjectShape a sh:NodeShape ;
         sh:targetClass shared:MediaObject ;
         dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
@@ -117,12 +202,33 @@ shared:shacl {
         dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
         oldap:externalOntology "false"^^xsd:boolean ;
         rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
-        rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
         sh:closed "true"^^xsd:boolean ;
         sh:node oldap:ThingShape ;
         sh:property [
             sh:path rdf:type ;
         ] ;
+        sh:property [
+            sh:path dcterms:type ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            oldap:statementProperty "false"^^xsd:boolean ;
+            oldap:externalOntology "false"^^xsd:boolean ;
+            sh:nodeKind sh:IRI ;
+            sh:in (
+                dcmitype:Collection
+                dcmitype:Dataset
+                dcmitype:StillImage
+                dcmitype:Image
+                dcmitype:MovingImage
+                dcmitype:Sound
+                dcmitype:Text
+            ) ;
+            sh:minCount 1 ;
+            sh:maxCount 1 ;
+            sh:order "0.5"^^xsd:decimal ;
+        ] ;
         sh:property [
                 sh:path shared:originalName ;
                 schema:version "0.1.0"^^xsd:string ;
@@ -344,6 +450,15 @@ shared:onto {
     # Media object
     ###########################################################################
 
+#        shared:mediaType rdf:type owl:ObjectProperty ;
+#            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+#            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+#            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+#            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+#            #owl:subPropertyOf dcterms:type ;
+#            rdfs:domain shared:MediaObject ;
+#            rdfs:range rdfs:Class ;
+
         shared:originalName rdf:type owl:DatatypeProperty ;
             rdfs:domain shared:MediaObject ;
             rdfs:range xsd:string ;
@@ -401,6 +516,12 @@ shared:onto {
             rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
             rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
             rdfs:subClassOf oldap:Thing ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty dcterms:type ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onClass rdfs:Class ;
+                ] ,
                 [
                     rdf:type owl:Restriction ;
                     owl:onProperty shared:originalName ;

oldaplib/src/connection.py

@@ -1,6 +1,6 @@
 import json
 import os
-from time import sleep
+import time
 
 import bcrypt
 import jwt
@@ -338,80 +338,52 @@ class Connection(IConnection):
         if not req.ok:
             raise OldapError(req.text)
 
+
+
     def upload_turtle(self, filename: str, graphname: Optional[str] = None) -> None:
         """
-        Uploads a turtle or trig file to the specified repository. This function sends the file to the triplestore for
-        import and does not wait for the completion of the import process. The process itself may continue for some time
-        after the command is issued.
-
-        :param filename: Name of the file to be uploaded.
-        :type filename: str
-        :param graphname: Optional; the name of the RDF-graph into which the data is to be imported.
-        :type graphname: str or None
-        :return: None
-        :rtype: None
-        :raises OldapError: Raised when there are issues with the repository or during the HTTP request.
-        """
-        # if not self._userdata:
-        #     raise OldapErrorNoPermission("No permission")
-        # actor = self._userdata
-        # sysperms = actor.inProject.get(QName('oldap:SystemProject'))
-        # is_root: bool = False
-        # if sysperms and AdminPermission.ADMIN_OLDAP in sysperms:
-        #     is_root = True
-        # if not is_root:
-        #     raise OldapErrorNoPermission("No permission")
+        Upload a TTL/TRiG file to GraphDB using the RDF4J /statements endpoint.
 
+        This call is synchronous: when it returns without error, the data is loaded.
+        """
         logger = get_logger()
-        with open(filename, encoding="utf-8") as f:
-            content = f.read()
-            ext = Path(filename).suffix
-            mime = ""
-            if ext == ".ttl":
-                mime = "text/turtle"
-            elif ext == ".trig":
-                mime = "application/x-trig"
-
-            ct = datetime.now().astimezone()
-            ts = ct.timestamp()
-            data = {
-                "name": f'Data from "{filename}"',
-                "status": None,
-                "message": "",
-                "context": graphname,
-                "replaceGraphs": [],
-                "baseURI": None,
-                "forceSerial": False,
-                "type": "text",
-                "format": mime,
-                "data": content,
-                "timestamp": ts,
-                "parserSettings": {
-                    "preserveBNodeIds": False,
-                    "failOnUnknownDataTypes": False,
-                    "verifyDataTypeValues": False,
-                    "normalizeDataTypeValues": False,
-                    "failOnUnknownLanguageTags": False,
-                    "verifyLanguageTags": True,
-                    "normalizeLanguageTags": True,
-                    "stopOnError": True
-                }
-            }
-            jsondata = json.dumps(data)
-            headers = {
-                "Accept": "application/json, text/plain, */*",
-                "Content-Type": "application/json; charset=utf-8"
-            }
-            url = f"{self._server}/rest/repositories/{self._repo}/import/upload/text"
-            auth = HTTPBasicAuth(self._dbuser, self._dbpassword) if self._dbuser and self._dbpassword else None
-            req = requests.post(url,
-                                headers=headers,
-                                data=jsondata,
-                                auth=auth)
-        if not req.ok:
-            logger.error(f'Upload of file "{filename}" failed: {req.text}')
-            raise OldapError(req.text)
-        logger.info(f'File "{filename}" uploaded.')
+
+        ext = Path(filename).suffix.lower()
+        if ext == ".ttl":
+            mime = "text/turtle"
+        elif ext == ".trig":
+            # use the standard MIME type for TriG
+            mime = "application/trig"
+        else:
+            raise OldapError(f"Unsupported RDF extension: {ext}")
+
+        with open(filename, "rb") as f:
+            data = f.read()
+
+        # RDF4J / GraphDB statements endpoint
+        url = f"{self._server.rstrip('/')}/repositories/{self._repo}/statements"
+
+        # Optional context: only use this if you really want to force
+        # all triples into a single named graph. For TriG you usually
+        # leave this empty so the quads' graph IRIs are respected.
+        params = {}
+        if graphname:
+            # GraphDB expects the context IRI wrapped in < > and URL-encoded
+            params["context"] = f"<{graphname}>"
+
+        auth = HTTPBasicAuth(self._dbuser, self._dbpassword) if self._dbuser and self._dbpassword else None
+        headers = {
+            "Content-Type": mime,
+            "Accept": "text/plain"  # or */*, result body is usually empty
+        }
+
+        resp = requests.post(url, params=params, headers=headers, data=data, auth=auth)
+
+        if not resp.ok:
+            logger.error(f'Upload of file "{filename}" failed: {resp.status_code} {resp.text}')
+            raise OldapError(resp.text)
+
+        logger.info(f'File "{filename}" uploaded synchronously via /statements.')
 
     def query(self, query: str, format: SparqlResultFormat = SparqlResultFormat.JSON) -> Any:
         """

oldaplib/src/datamodel.py

@@ -1,7 +1,8 @@
+import io
 from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Dict, List, Optional, Union, Any, Self
+from typing import Dict, List, Optional, Union, Any, Self, TextIO
 
 from oldaplib.src.cachesingleton import CacheSingleton, CacheSingletonRedis
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
@@ -723,57 +724,58 @@ class DataModel(Model):
         cache = CacheSingletonRedis()
         cache.delete(Xsd_QName(self._project.projectShortName, 'shacl'))
 
-
-    def write_as_trig(self, filename: str, indent: int = 0, indent_inc: int = 4) -> None:
+    def __to_trig_format(self, f: TextIO, indent: int = 0, indent_inc: int = 4) -> None:
         """
-        Write the complete datamodel in the trig format to a file.
-
-        This method serializes the complete datamodel, including its SHACL
-        shapes and OWL ontology, and writes the resulting data in the trig
-        format to the specified file.
-
-        :param filename: The path of the file where the trig data will be
-                         written
-        :type filename: str
-        :param indent: Start level of indentation for serialized data. Defaults
-                       to 0
-        :type indent: int
-        :param indent_inc: Number of characters to increment for each indent
-                           level. Defaults to 4
-        :type indent_inc: int
+        Generates and writes TriG-formatted RDF data to the given TextIO object. The method constructs
+        SHACL and OWL ontology representations based on the internal state and configuration of the
+        object. SHACL validation shapes, ontology metadata, and RDF structure are included. This
+        method is primarily used for exporting RDF data in a standard, compliant format.
+
+        :param f: The output stream (e.g., a file or any TextIO object) where the generated TriG
+            data will be written.
+        :param indent: The base indentation level applied when formatting the output.
+        :param indent_inc: The number of spaces added for each level of indentation to format
+            nested structures cleanly.
         :return: None
         """
+        timestamp = Xsd_dateTime.now()
+        blank = ''
+        context = Context(name=self._con.context_name)
+        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 + 1) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n')
+        f.write('\n')
+        for qname, onto in self.__extontos.items():
+            f.write(onto.create_shacl(timestamp=timestamp, indent=1))
+        f.write('\n\n')
+        for iri, prop in self.__propclasses.items():
+            if not prop.internal:
+                f.write(prop.create_shacl(timestamp=timestamp, indent=1))
+        f.write('\n\n')
+        for iri, resclass in self.__resclasses.items():
+            f.write(resclass.create_shacl(timestamp=timestamp, indent=1))
+        f.write('\n\n')
+        f.write(f'\n{blank:{indent * indent_inc}}}}\n')
+
+        f.write(f'{blank:{indent * indent_inc}}{self.__graph}:onto {{\n')
+        f.write(f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:ontology owl:type owl:Ontology ;\n')
+        f.write(f'{blank:{(indent + 2) * indent_inc}}owl:versionInfo {self.__version.toRdf} .\n')
+        f.write('\n')
+        for iri, prop in self.__propclasses.items():
+            f.write(prop.create_owl_part1(timestamp=timestamp, indent=2))
+        for iri, resclass in self.__resclasses.items():
+            f.write(resclass.create_owl(timestamp=timestamp))
+        f.write(f'{blank:{indent * indent_inc}}}}\n')
+
+    def write_as_trig(self, filename: str, indent: int = 0, indent_inc: int = 4) -> None:
         with open(filename, 'w') as f:
-            timestamp = Xsd_dateTime.now()
-            blank = ''
-            context = Context(name=self._con.context_name)
-            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 + 1) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n')
-            f.write('\n')
-            for qname, onto in self.__extontos.items():
-                f.write(onto.create_shacl(timestamp=timestamp, indent=1))
-            f.write('\n\n')
-            for iri, prop in self.__propclasses.items():
-                if not prop.internal:
-                    f.write(prop.create_shacl(timestamp=timestamp, indent=1))
-            f.write('\n\n')
-            for iri, resclass in self.__resclasses.items():
-                f.write(resclass.create_shacl(timestamp=timestamp, indent=1))
-            f.write('\n\n')
-            f.write(f'\n{blank:{indent * indent_inc}}}}\n')
-
-            f.write(f'{blank:{indent * indent_inc}}{self.__graph}:onto {{\n')
-            f.write(f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:ontology owl:type owl:Ontology ;\n')
-            f.write(f'{blank:{(indent + 2) * indent_inc}}owl:versionInfo {self.__version.toRdf} .\n')
-            f.write('\n')
-            for iri, prop in self.__propclasses.items():
-                f.write(prop.create_owl_part1(timestamp=timestamp, indent=2))
-            for iri, resclass in self.__resclasses.items():
-                f.write(resclass.create_owl(timestamp=timestamp))
-            f.write(f'{blank:{indent * indent_inc}}}}\n')
+            self.__to_trig_format(f, indent=indent, indent_inc=indent_inc)
 
+    def write_as_str(self, indent: int = 0, indent_inc: int = 4) -> str:
+        f = io.StringIO()
+        self.__to_trig_format(f, indent=indent, indent_inc=indent_inc)
+        return f.getvalue()
 
 
 

oldaplib/src/helpers/context.py

@@ -48,6 +48,7 @@ class ContextSingleton(type):
             Xsd_NCName('schema'): NamespaceIRI('http://schema.org/'),
             #Xsd_NCName('dc'): NamespaceIRI('http://purl.org/dc/elements/1.1/'),
             Xsd_NCName('dcterms'): NamespaceIRI('http://purl.org/dc/terms/'),
+            Xsd_NCName('dcmitype'): NamespaceIRI('http://purl.org/dc/dcmitype/'),
             #Xsd_NCName('foaf'): NamespaceIRI('http://xmlns.com/foaf/0.1/'),
             Xsd_NCName('oldap'): NamespaceIRI('http://oldap.org/base#'),
             Xsd_NCName('shared'): NamespaceIRI('http://oldap.org/shared#')
@@ -63,6 +64,7 @@ class ContextSingleton(type):
             NamespaceIRI('http://schema.org/'): Xsd_NCName('schema'),
             #NamespaceIRI('http://purl.org/dc/elements/1.1/'): Xsd_NCName('dc'),
             NamespaceIRI('http://purl.org/dc/terms/'): Xsd_NCName('dcterms'),
+            NamespaceIRI('http://purl.org/dc/dcmitype/'): Xsd_NCName('dcmitype'),
             #NamespaceIRI('http://xmlns.com/foaf/0.1/'): Xsd_NCName('foaf'),
             NamespaceIRI('http://oldap.org/base#'): Xsd_NCName('oldap'),
             NamespaceIRI('http://oldap.org/shared#'): Xsd_NCName('shared'),
@@ -237,7 +239,7 @@ class Context(metaclass=ContextSingleton):
             return Xsd_QName(prefix, fragment, validate=validate)
         return None
 
-    def qname2iri(self, qname: Xsd_QName | str, validate: bool = True) -> NamespaceIRI:
+    def qname2iri(self, qname: Xsd_QName | str, validate: bool = True) -> Xsd_anyURI:
         """
         Convert a QName into a IRI string.
 

oldaplib/src/objectfactory.py

@@ -231,8 +231,25 @@ class ResourceInstance:
             return  # TODO: LangString does not yet allow multiple entries of the same language...
         if property.get(PropClassAttr.IN):
             #for val in values:
-            if not values in property[PropClassAttr.IN]:
-                raise OldapErrorValue(f'Property {property} with IN={property[PropClassAttr.IN]} has invalid value "{val}"')
+            if property.datatype is None:  # no defined datatype, e.h.sh:IRI
+                tmpinset = {str(x) for x in property[PropClassAttr.IN]}
+                if isinstance(values, (list, tuple, set, ObservableSet)):
+                    for val in values:
+                        if not str(val) in tmpinset:
+                            raise OldapErrorValue(
+                                f'Property {property} with IN={property[PropClassAttr.IN]} has invalid value "{val}"')
+                else:
+                    if not str(values) in tmpinset:
+                        raise OldapErrorValue(f'Property {property.property_class_iri} with IN={property[PropClassAttr.IN]} has invalid value "{values}"')
+            else:
+                if isinstance(values, (list, tuple, set, ObservableSet)):
+                    for val in values:
+                        if not val in property[PropClassAttr.IN]:
+                            raise OldapErrorValue(
+                                f'Property {property} with IN={property[PropClassAttr.IN]} has invalid value "{val}"')
+                else:
+                    if not values in property[PropClassAttr.IN]:
+                        raise OldapErrorValue(f'Property {property.property_class_iri} with IN={property[PropClassAttr.IN]} has invalid value "{values}"')
         if property.get(PropClassAttr.MIN_LENGTH):
             for val in values:
                 l = 0

oldaplib/src/oldaplist.py

@@ -725,6 +725,7 @@ class OldapList(Model):
         self.clear_changeset()
 
         cache = CacheSingletonRedis()
+        cache.delete(Xsd_QName(self.project.projectShortName, 'shacl'))
         cache.set(self.__iri, self)
 
     def update(self, indent: int = 0, indent_inc: int = 4) -> None:
@@ -798,6 +799,7 @@ class OldapList(Model):
         #
         cache = CacheSingletonRedis()
         cache.delete(self.__iri)
+        cache.delete(Xsd_QName(self.project.projectShortName, 'shacl'))
 
 
     def in_use_queries(self) -> (str, str):

oldaplib/src/permissionset.py

@@ -190,6 +190,21 @@ class PermissionSet(Model):
     def qname(self) -> Xsd_QName:
         return self.__permset_iri
 
+    def trig_to_str(self, created: Xsd_dateTime, modified: Xsd_dateTime, indent: int = 0, indent_inc: int = 4):
+        blank = ''
+        sparql = ''
+        sparql += f'{blank:{indent * indent_inc}} {self.__permset_iri.toRdf} a oldap:PermissionSet'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:created {created.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 {modified.toRdf}'
+        for attr, value in self._attributes.items():
+            if attr.value.prefix == 'virtual' or not value:
+                continue
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
+        return sparql
+
+
     def create(self, indent: int = 0, indent_inc: int = 4) -> None:
         """
         Creates and stores a permission set in the triple store.
@@ -236,15 +251,16 @@ class PermissionSet(Model):
         sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{\n'
         sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
 
-        sparql += f'{blank:{(indent + 2) * indent_inc}} {self.__permset_iri.toRdf} a oldap:PermissionSet'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
-        for attr, value in self._attributes.items():
-            if attr.value.prefix == 'virtual' or not value:
-                continue
-            sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
+        sparql += self.trig_to_str(created=timestamp, modified=timestamp, indent=indent + 2, indent_inc=indent_inc)
+        # sparql += f'{blank:{(indent + 2) * indent_inc}} {self.__permset_iri.toRdf} a oldap:PermissionSet'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
+        # for attr, value in self._attributes.items():
+        #     if attr.value.prefix == 'virtual' or not value:
+        #         continue
+        #     sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}}}\n'
         sparql += f'{blank:{indent * indent_inc}}}}\n'
 
@@ -307,6 +323,7 @@ class PermissionSet(Model):
         :raises OldapErrorInconsistency: Raised if the permission set contains inconsistencies
                                          in its data during retrieval.
         """
+        context = Context(name=con.context_name)
         if qname:
             permset_iri = Xsd_QName(qname, validate=True)
         elif permissionSetId and definedByProject:
@@ -325,7 +342,6 @@ class PermissionSet(Model):
             if tmp is not None:
                 tmp.update_notifier()
                 return tmp
-        context = Context(name=con.context_name)
         sparql = context.sparql_context
         sparql += f"""
         SELECT ?permset ?p ?o

oldaplib/src/project.py

@@ -426,6 +426,21 @@ class Project(Model):
                 projects.append(ProjectSearchResult(r['project'], r['shortname']))
         return projects
 
+
+    def trig_to_str(self, created: Xsd_dateTime, modified: Xsd_dateTime,indent: int = 0, indent_inc: int = 4):
+        blank = ''
+        sparql = ''
+        sparql += f'\n{blank:{indent * indent_inc}}{self.projectIri.toRdf} a oldap:Project'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:created {created.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 {modified.toRdf}'
+        for attr, value in self._attributes.items():
+            if not value:
+                continue
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
+        return sparql
+
     def create(self, indent: int = 0, indent_inc: int = 4) -> None:
         """
         Creates a new project in the triple store. The function starts by
@@ -459,11 +474,14 @@ class Project(Model):
             raise OldapErrorNoPermission(message)
 
         timestamp = Xsd_dateTime.now()
-        indent: int = 0
-        indent_inc: int = 4
+        #indent: int = 0
+        #indent_inc: int = 4
 
         context = Context(name=self._con.context_name)
 
+        #
+        # SPARQL to check if project with the given projectShortName already exists
+        #
         sparql0 = context.sparql_context
         sparql0 += f"""
         ASK {{
@@ -475,15 +493,9 @@ class Project(Model):
         }}
         """
 
-        sparql1 = context.sparql_context
-        sparql1 += f"""
-        SELECT ?project
-        FROM oldap:admin
-        WHERE {{
-            ?project a oldap:Project .
-            FILTER(?project = {self.projectIri.toRdf})
-        }}
-        """
+        #
+        # SPARQL to check if the given namespaceIri is already used by another project
+        #
         sparql1a = context.sparql_context
         sparql1a += f"""
         ASK {{
@@ -493,6 +505,9 @@ class Project(Model):
         }}
         """
 
+        #
+        # SPARQL to check if project with the given projectIri already exists
+        #
         sparql1b = context.sparql_context
         sparql1b += f"""
         ASK {{
@@ -506,15 +521,16 @@ class Project(Model):
         sparql2 = context.sparql_context
         sparql2 += f'{blank:{indent * indent_inc}}INSERT DATA {{'
         sparql2 += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{'
-        sparql2 += f'\n{blank:{(indent + 2) * indent_inc}}{self.projectIri.toRdf} a oldap:Project'
-        sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
-        sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
-        sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
-        sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
-        for attr, value in self._attributes.items():
-            if not value:
-                continue
-            sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
+        sparql2 += self.trig_to_str(created=timestamp, modified=timestamp, indent=indent + 2, indent_inc=indent_inc)
+        # sparql2 += f'\n{blank:{(indent + 2) * indent_inc}}{self.projectIri.toRdf} a oldap:Project'
+        # sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
+        # sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
+        # sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
+        # sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
+        # for attr, value in self._attributes.items():
+        #     if not value:
+        #         continue
+        #     sparql2 += f' ;\n{blank:{(indent + 3) * indent_inc}}{attr.value.toRdf} {value.toRdf}'
         sparql2 += f' .\n{blank:{(indent + 1) * indent_inc}}}}\n'
         sparql2 += f'{blank:{indent * indent_inc}}}}\n'
 

oldaplib/src/user.py

@@ -363,7 +363,43 @@ class User(Model):
             self._changeset[UserAttr.IN_PROJECT] = AttributeChange(self._attributes[UserAttr.IN_PROJECT], Action.MODIFY)
         self._attributes[UserAttr.IN_PROJECT][project].remove(permission)
 
-    def create(self, indent: int = 0, indent_inc: int = 4) -> None:
+    def trig_to_str(self,
+                    creator: Iri,
+                    created: Xsd_dateTime,
+                    contributor: Iri,
+                    modified: Xsd_dateTime,
+                    indent: int = 0, indent_inc: int = 4):
+        blank = ''
+        sparql = ''
+        sparql += f'{blank:{indent * indent_inc}}{self.userIri.toRdf} a oldap:User'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:creator {creator.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:created {created.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:contributor {contributor.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}dcterms:modified {modified.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:userId {self.userId.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}schema:familyName {self.familyName.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}schema:givenName {self.givenName.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}schema:email {self.email.toRdf}'
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:credentials {self.credentials.toRdf}'
+        activeval = "true" if self.isActive else "false"
+        sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:isActive {activeval}'
+        star = ''
+        if self.inProject:
+            project = [p.toRdf for p in self.inProject.keys()]
+            rdfstr = ", ".join(project)
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:inProject {rdfstr}'
+            for p in self.inProject.keys():
+                for admin_p in self.inProject[p]:  # TODO: May be use .get() instead of [] !!!!!!!!!!!!!!!!!!!!!!!!!
+                    star += f'{blank:{indent * indent_inc}}<<{self.userIri.toRdf} oldap:inProject {p.toRdf}>> oldap:hasAdminPermission {admin_p.value} .\n'
+        if self.hasPermissions:
+            rdfstr = ", ".join([str(x) for x in self.hasPermissions])
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}oldap:hasPermissions {rdfstr}'
+        sparql += " .\n\n"
+        sparql += star
+        return sparql
+
+
+    def create(self, indent: int = 0, indent_inc: int = 4, keep_dates: bool = False) -> None:
         """
         Creates a user in the triple store with the provided details. Before proceeding with the
         creation, it verifies the uniqueness of the `userId` and `userIri`. The user is created
@@ -444,31 +480,43 @@ class User(Model):
         sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{\n'
         sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
 
-        sparql += f'{blank:{(indent + 2) * indent_inc}}{self.userIri.toRdf} a oldap:User'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:userId {self.userId.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:familyName {self.familyName.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:givenName {self.givenName.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:email {self.email.toRdf}'
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:credentials {self.credentials.toRdf}'
-        activeval = "true" if self.isActive else "false"
-        sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:isActive {activeval}'
-        star = ''
-        if self.inProject:
-            project = [p.toRdf for p in self.inProject.keys()]
-            rdfstr = ", ".join(project)
-            sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:inProject {rdfstr}'
-            for p in self.inProject.keys():
-                for admin_p in self.inProject[p]:  # TODO: May be use .get() instead of [] !!!!!!!!!!!!!!!!!!!!!!!!!
-                    star += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:inProject {p.toRdf}>> oldap:hasAdminPermission {admin_p.value} .\n'
-        if self.hasPermissions:
-            rdfstr = ", ".join([str(x) for x in self.hasPermissions])
-            sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:hasPermissions {rdfstr}'
-        sparql += " .\n\n"
-        sparql += star
+        if keep_dates:
+            sparql += self.trig_to_str(creator=self.creator,
+                                       created=self.created,
+                                       contributor=self.contributor,
+                                       modified=self.modified,
+                                       indent=indent + 2, indent_inc=indent_inc)
+        else:
+            sparql += self.trig_to_str(creator=self._con.userIri,
+                                       created=timestamp,
+                                       contributor=self._con.userIri,
+                                       modified=timestamp,
+                                       indent=indent + 2, indent_inc=indent_inc)
+        # sparql += f'{blank:{(indent + 2) * indent_inc}}{self.userIri.toRdf} a oldap:User'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:creator {self._con.userIri.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:created {timestamp.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:contributor {self._con.userIri.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}dcterms:modified {timestamp.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:userId {self.userId.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:familyName {self.familyName.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:givenName {self.givenName.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}schema:email {self.email.toRdf}'
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:credentials {self.credentials.toRdf}'
+        # activeval = "true" if self.isActive else "false"
+        # sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:isActive {activeval}'
+        # star = ''
+        # if self.inProject:
+        #     project = [p.toRdf for p in self.inProject.keys()]
+        #     rdfstr = ", ".join(project)
+        #     sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:inProject {rdfstr}'
+        #     for p in self.inProject.keys():
+        #         for admin_p in self.inProject[p]:  # TODO: May be use .get() instead of [] !!!!!!!!!!!!!!!!!!!!!!!!!
+        #             star += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:inProject {p.toRdf}>> oldap:hasAdminPermission {admin_p.value} .\n'
+        # if self.hasPermissions:
+        #     rdfstr = ", ".join([str(x) for x in self.hasPermissions])
+        #     sparql += f' ;\n{blank:{(indent + 3) * indent_inc}}oldap:hasPermissions {rdfstr}'
+        # sparql += " .\n\n"
+        # sparql += star
         sparql += f'{blank:{(indent + 1) * indent_inc}}}}\n'
         sparql += f'{blank:{indent * indent_inc}}}}\n'
 

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.27"
+__version__ = "0.3.28"

oldaplib/src/xsd/xsd_anyuri.py

@@ -69,15 +69,15 @@ class Xsd_anyURI(Xsd):
                     raise OldapErrorValue(f'Invalid URN format for "{value}".')
             elif value.startswith("http"):
                 if not re.match(self._uri_pattern, str(value)):
-                    raise OldapErrorValue(f'Invalid string "{value}" for xsd:anyURI.')
+                    raise OldapErrorValue(f'Invalid string "{value}" for xsd:anyURI (regexp).')
                 if validate:
                     if not XsdValidator.validate(XsdDatatypes.anyURI, str(value)):
-                        raise OldapErrorValue(f'Invalid string "{value}" for anyURI')
+                        raise OldapErrorValue(f'Invalid string "{value}" for xsd:anyURI (validator)')
                     else:
                         if not url(str(value)):
-                            raise OldapErrorValue(f'Invalid string "{value}" for xsd:anyURI.')
+                            raise OldapErrorValue(f'Invalid string "{value}" for xsd:anyURI (url()).')
             else:
-                raise OldapErrorValue(f'Invalid string "{value}" for anyURI')
+                raise OldapErrorValue(f'Invalid string "{value}" for anyURI (no urn:/http:)')
             self._value = str(value)
         self._append_allowed = self._value[-1] == '/' or self._value[-1] == '#'
 

oldaplib/test/XXX_test_fasnacht.py

@@ -0,0 +1,17 @@
+from oldaplib.src.connection import Connection
+import unittest
+
+from oldaplib.src.datamodel import DataModel
+from oldaplib.src.project import Project
+
+class TestDataModel(unittest.TestCase):
+
+    # @unittest.skip('Work in progress')
+    def test_fasnacht(self):
+        connection = Connection(userId="rosenth",
+                                     credentials="RioGrande",
+                                     context_name="DEFAULT")
+
+        project = Project.read(connection, "fasnacht")
+        dm = DataModel.read(connection, project, ignore_cache=False)
+        pass

oldaplib/test/test_connection.py

@@ -52,7 +52,6 @@ class TestBasicConnection(unittest.TestCase):
         cls._connection.clear_graph(Xsd_QName('test:onto'))
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
 
     @classmethod
     def tearDownClass(cls):

oldaplib/test/test_context.py

@@ -55,14 +55,14 @@ class TestContext(unittest.TestCase):
         self.assertIsNone(qn)
         with self.assertRaises(OldapError) as ex:
             qn = context.iri2qname('waseliwas/soll')
-        self.assertEqual(str(ex.exception), 'Invalid string "waseliwas/soll" for anyURI')
+        self.assertEqual(str(ex.exception), 'Invalid string "waseliwas/soll" for anyURI (no urn:/http:)')
 
     def test_context_qname2iri(self):
         context = Context(name='qname2iri')
         self.assertEqual(context.qname2iri(Xsd_QName('skos:gaga')), 'http://www.w3.org/2004/02/skos/core#gaga')
         with self.assertRaises(OldapError) as ex:
             qn = context.iri2qname('gaga')
-        self.assertEqual(str(ex.exception), 'Invalid string "gaga" for anyURI')
+        self.assertEqual(str(ex.exception), 'Invalid string "gaga" for anyURI (no urn:/http:)')
         self.assertIsNone(context.iri2qname('abc:def'))
         t = Xsd_QName('xml:integer')
         self.assertEqual(context.qname2iri(t), 'http://www.w3.org/XML/1998/namespace#integer')
@@ -79,6 +79,7 @@ PREFIX sh: <http://www.w3.org/ns/shacl#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema: <http://schema.org/>
 PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX dcmitype: <http://purl.org/dc/dcmitype/>
 PREFIX oldap: <http://oldap.org/base#>
 PREFIX shared: <http://oldap.org/shared#>
 PREFIX test: <http://www.test.org/gaga#>
@@ -97,6 +98,7 @@ PREFIX test: <http://www.test.org/gaga#>
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix schema: <http://schema.org/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
+@prefix dcmitype: <http://purl.org/dc/dcmitype/> .
 @prefix oldap: <http://oldap.org/base#> .
 @prefix shared: <http://oldap.org/shared#> .
 @prefix test: <http://www.test.org/gaga#> .

oldaplib/test/test_datamodel.py

@@ -102,9 +102,6 @@ class TestDataModel(unittest.TestCase):
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
 
-
-        sleep(1)  # upload may take a while...
-
         cls._project = Project.read(cls._connection, "test", ignore_cache=True)
         cls._dmproject = Project.read(cls._connection, "dmtest", ignore_cache=True)
         cls._dmprojectA = Project.read(cls._connection, "dmtestA", ignore_cache=True)
@@ -390,6 +387,7 @@ class TestDataModel(unittest.TestCase):
 
     def test_datamodel_read_shared(self):
         model = DataModel.read(self._connection, self._sharedproject, ignore_cache=True)
+        pass
 
     def test_datamodel_read_system(self):
         model = DataModel.read(self._connection, self._sysproject, ignore_cache=True)
@@ -1114,8 +1112,6 @@ class TestDataModel(unittest.TestCase):
         file = project_root / 'oldaplib' / 'testdata' / 'objectfactory_test.trig'
         self._connection.upload_turtle(file)
 
-        sleep(1)  # upload may take a while...
-
         cache = CacheSingletonRedis()
         cache.clear()
         dm1 = DataModel.read(self._connection, self._project, ignore_cache=False)
@@ -1123,3 +1119,4 @@ class TestDataModel(unittest.TestCase):
         dm2 = DataModel.read(self._connection, self._project, ignore_cache=False)
 
         pass
+

oldaplib/test/test_externalontologies.py

@@ -51,7 +51,6 @@ class TestexternalOntologies(unittest.TestCase):
         cls._connection.upload_turtle(file)
         file = project_root / 'oldaplib' / 'ontologies' / 'admin-testing.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
 
         project = Project(con=cls._connection,
                           projectIri=Iri("http://extonto.test.org/test"),

oldaplib/test/test_hasproperty.py

@@ -52,7 +52,6 @@ class TestHasProperty(unittest.TestCase):
 
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
         cls._project = Project.read(cls._connection, "test")
 
     @classmethod

oldaplib/test/test_objectfactory.py

@@ -108,8 +108,6 @@ class TestObjectFactory(unittest.TestCase):
         file = project_root / 'oldaplib' / 'testdata' / 'instances_test.trig'
         cls._connection.upload_turtle(file)
 
-        sleep(1)  # upload may take a while...
-
         user = User.read(cls._connection, "rosenth")
         user.hasPermissions.add(Iri('oldap:GenericUpdate'))  # TODO: SHOULD WORK WITH Xsd_QName
         user.update()
@@ -362,6 +360,7 @@ class TestObjectFactory(unittest.TestCase):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         MO = factory.createObjectInstance('shared:MediaObject')
         mo = MO(originalName='Cat.tif',
+                type='dcmitype:StillImage',
                 originalMimeType='image/tiff',
                 serverUrl='http://iiif.oldap.org/iiif/3/',
                 imageId='cat.tif',
@@ -547,7 +546,7 @@ class TestObjectFactory(unittest.TestCase):
                    givenName="Max",
                    grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
         p.create()
-        sleep(1)
+
         obj1 = Person.read(con=self._connection,
                            iri=p.iri)
         with self.assertRaises(OldapErrorValue):
@@ -719,6 +718,7 @@ class TestObjectFactory(unittest.TestCase):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         MLE = factory.createObjectInstance('test:MediaLibraryEntry')
         mle = MLE(originalName='MyCarnivalImagetif',
+                  type='dcmitype:StillImage',
                   originalMimeType='image/tiff',
                   imageId='x_34dbY4.tif',
                   serverUrl='http://iiif.oldap.org/iiif/3/',

oldaplib/test/test_oldaplist.py

@@ -80,7 +80,7 @@ class TestOldapList(unittest.TestCase):
 
         file = cls._project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)
+
         cls._project = Project.read(cls._connection, "test")
         LangString.defaultLanguage = Language.EN
 

oldaplib/test/test_oldaplist_helpers.py

@@ -66,7 +66,7 @@ class OldapListHelperTestCase(unittest.TestCase):
         cls._connection.clear_graph(Xsd_QName('hyha:data'))
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)
+
         cls._project = Project.read(cls._connection, "test")
         LangString.defaultLanguage = Language.EN
 

oldaplib/test/test_oldaplistnode.py

@@ -84,7 +84,6 @@ class TestOldapListNode(unittest.TestCase):
 
         file = cls._project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)
 
         cls._project = Project.read(cls._connection, "test")
         cls._dmproject = Project.read(cls._connection, "dmtest", ignore_cache=True)

oldaplib/test/test_permissionset.py

@@ -78,7 +78,7 @@ class TestPermissionSet(unittest.TestCase):
         cls._connection.clear_graph(Xsd_QName('test:data'))
         file = cls._project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)
+
         cls._project = Project.read(cls._connection, "test")
         LangString.defaultLanguage = Language.EN
 
@@ -347,6 +347,7 @@ class TestPermissionSet(unittest.TestCase):
         ps.update()
         ps = PermissionSet.read(con=self._connection, permissionSetId=psId, definedByProject=Iri('oldap:SystemProject'))
         self.assertEqual(ps.givesPermission, DataPermission.DATA_VIEW)
+        self.assertEqual(ps.givesPermission, DataPermission.DATA_VIEW)
         self.assertEqual(ps.label, LangString("testUpdatePerm@en", "testVerändernPerm@de", "testeModificationPerm@fr"))
         del ps.comment
         ps.update()

oldaplib/test/test_project.py

@@ -56,7 +56,6 @@ class Testproject(unittest.TestCase):
         cls._connection.upload_turtle(file)
         file = project_root / 'oldaplib' / 'ontologies' / 'admin-testing.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
 
     @classmethod
     def tearDownClass(cls):

oldaplib/test/test_propertyclass.py

@@ -70,7 +70,6 @@ class TestPropertyClass(unittest.TestCase):
         cls._connection.clear_graph(Xsd_QName('test:onto'))
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
         cls._project = Project.read(cls._connection, "test")
         cls._sysproject = Project.read(cls._connection, "oldap")
 

oldaplib/test/test_resourceclass.py

@@ -137,7 +137,7 @@ class TestResourceClass(unittest.TestCase):
 
         file = project_root / 'oldaplib' / 'testdata' / 'connection_test.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
+
         cls._project = Project.read(cls._connection, "test")
         cls._sysproject = Project.read(cls._connection, "oldap", ignore_cache=True)
 

oldaplib/test/test_user.py

@@ -61,7 +61,6 @@ class TestUser(unittest.TestCase):
         cls._connection.upload_turtle(file)
         file = project_root / 'oldaplib' / 'ontologies' / 'admin-testing.trig'
         cls._connection.upload_turtle(file)
-        sleep(1)  # upload may take a while...
 
     def tearDown(self):
         pass

oldaplib/test/test_xsd_datatypes.py

@@ -281,7 +281,7 @@ class TestXsdDatatypes(unittest.TestCase):
         self.assertEqual(hash(val1), hash(val2))
         with self.assertRaises(OldapErrorValue) as ex:
             val = Xsd_anyURI('waseliwas', validate=True)
-        self.assertEqual(str(ex.exception), 'Invalid string "waseliwas" for anyURI')
+        self.assertEqual(str(ex.exception), 'Invalid string "waseliwas" for anyURI (no urn:/http:)')
 
     def test_xsd_base64binary(self):
         data = base64.b64encode(b'Waseliwas soll den das sein?')

{oldaplib-0.3.27.dist-info → oldaplib-0.3.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.27
+Version: 0.3.28
 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.27.dist-info → oldaplib-0.3.28.dist-info}/RECORD

@@ -1,16 +1,15 @@
 oldaplib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oldaplib/apps/load_list.py,sha256=Dr0oLPUMoJkAD55_flAt6y8hjx_ci7uuOQzYBUOr8Sc,1840
 oldaplib/ontologies/admin-testing.trig,sha256=O1_WateUvdouG0zEdnNG0BWkIIMdoTGaTqb1wAD8njs,5694
 oldaplib/ontologies/admin.trig,sha256=ByxFYdI9rh-RhLnSpkdZHMMWgXCSTi2YMJc1QgBHFhE,8963
 oldaplib/ontologies/example.trig,sha256=MdRrFBZZ1L6aUDiT6aX4cnXiy-RoZHczF3Exn7aBSmU,1518
 oldaplib/ontologies/oldap.trig,sha256=i2XanqKlhWSIdD17fLu5g0Luq2GORQCcyIfLn9Kummk,60241
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
-oldaplib/ontologies/shared.trig,sha256=ooIn1Cg0Hg_ml67dCCyVEy2mQ-1AV1sQ6VN-lk0WYpU,21860
+oldaplib/ontologies/shared.trig,sha256=8BMbhsqmnGAFUotc1bGc6morWhJqU0pCGy9TlkiEKIY,27550
 oldaplib/ontologies/standard/.gitsave,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/cachesingleton.py,sha256=WGhuFER-mTnOJmwaN17fXPAg7zn7GJBm-XadShNUBBk,3687
-oldaplib/src/connection.py,sha256=LJMJO65QhSbheIEBnOCphRyAD1STwkO8zfNcYPcKwP8,29016
-oldaplib/src/datamodel.py,sha256=GJiWSvfH6VYos4mpxOxj2eoMM1kTNZkhf2ITWGM86Cc,35016
+oldaplib/src/connection.py,sha256=CmQWJgsLx1mTOUV_uSGamA8OoyomfsABR7wM2UX_muY,27549
+oldaplib/src/datamodel.py,sha256=Fn9IkU-niOFq7Ih1km9BPHHnCd_klEqU3-6uMGwPKZY,35343
 oldaplib/src/dtypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/dtypes/bnode.py,sha256=7Swl77PJlzahov7d7ijJExmoVsTkR5JFOvFQf1jDmEg,1555
 oldaplib/src/dtypes/languagein.py,sha256=6h3VrTH8IcTN6mvnWuGvzDoKX_Jh6h9w3wWrLuAWfVc,8593
@@ -41,7 +40,7 @@ oldaplib/src/hasproperty.py,sha256=w2rNuhqyWdJYAXnGROFLZUyafCpznPv-h_XuQSFWbqs,1
 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
-oldaplib/src/helpers/context.py,sha256=F71fE9ElsX5xYTTsL_22hdwt1_mJd9tJWIRVQ5InW9Y,11604
+oldaplib/src/helpers/context.py,sha256=HyI7GG3D67xdurBYGqd0Uyzy8yFuBXjaVwf1dykBzbo,11766
 oldaplib/src/helpers/convert2datatype.py,sha256=jLhcOBfsGQVwYjzvQBUbFrFWoIquS44kU81aJ5BhMaA,6447
 oldaplib/src/helpers/irincname.py,sha256=XZoV6eEsWVssvhQE9w1TD0cYDX1EYQnhN8PiU9gjvng,2473
 oldaplib/src/helpers/json_encoder.py,sha256=c78h9uf58zfLaK8X7S1KCK4otY3iEltGnPBy_5ryiCk,2135
@@ -59,23 +58,23 @@ oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=2KuhHPj8DNveFRBeImrRfxlCOYhBK-mcxXYUp6s--j8,10672
 oldaplib/src/model.py,sha256=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
-oldaplib/src/objectfactory.py,sha256=XIXMixHRzTto2OVGe5kYnT10i2zXV6eBPw3m-kCC6eQ,66413
-oldaplib/src/oldaplist.py,sha256=sGAvEEJukRCjM70G0NFaR-L9YPleQTOtdWGExj3oYL8,42933
+oldaplib/src/objectfactory.py,sha256=0kKYh48JJbFRrhAvrMy65E_7seKFg1bGPBlgD6xo0Z4,67554
+oldaplib/src/oldaplist.py,sha256=s5afrHtUnvDfMUFoZTt-jMxlBlmK2c0tLeTMp0KiIfg,43077
 oldaplib/src/oldaplist_helpers.py,sha256=1Gur0nS1PCKb9iUtCKPUFDOYjw6vvAwYpe-G3DdxlEc,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
 oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,1242
-oldaplib/src/permissionset.py,sha256=bzzVuZ7O_yVMujziwo32GEJIZYGG3g5gTds4HjLmGtU,31874
-oldaplib/src/project.py,sha256=DNwViRg19zkE1F0zuWqQFK008uTVehVAu7xNbyessig,34207
+oldaplib/src/permissionset.py,sha256=JU9cwgAEf3ppHvSzPZEgKxhYcYVxZoN1mqP96lexOSA,32912
+oldaplib/src/project.py,sha256=ic0cIYYcPk--7XsfbymuGkFbiUFmFJqNgjTWY2Rws7Q,35266
 oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78,97213
 oldaplib/src/resourceclass.py,sha256=_WEyZRlt_sA_q8vzoOP8PdkBtjje8khiVHyvr_-1_ro,102817
-oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
+oldaplib/src/user.py,sha256=fJVTbKjFi2WvnEzyDt77_Yh9s1X1Er3JkWHBQd-hF20,51805
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=7d2IQsF-WYLs9HCeClz3jfE-kzaYLG-AcDfpiQ8xfrs,22
+oldaplib/src/version.py,sha256=giDvISHbc4E1R9Lm3V5loYL-rswle56sCcNX9JTtpF4,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
 oldaplib/src/xsd/xsd.py,sha256=KiAIhqE7y5s7rPZWxA8eP-1Spf_saFOndNznaWOKSbM,1550
-oldaplib/src/xsd/xsd_anyuri.py,sha256=ntSo4keAmeD8d7-5GtkjgRV1FVyu6KsipZHIBnMnQCg,6195
+oldaplib/src/xsd/xsd_anyuri.py,sha256=tsZfOpIlsomQubywMmXzgoX-LvtQ7hBdfP7TrGpW7Xk,6244
 oldaplib/src/xsd/xsd_base64binary.py,sha256=beHouGagNdqTxH7MHh03YKuErlHx4qSjmBrKdGB6sTU,3930
 oldaplib/src/xsd/xsd_boolean.py,sha256=fzV_szKf2bq3E-p0mgARSOcuGWdH1T1LGVGkeD4E36A,2901
 oldaplib/src/xsd/xsd_byte.py,sha256=LTE210keT1O78MnhNdAp4E1F-UhzNX4UYAnUVLopHxA,1017
@@ -115,30 +114,31 @@ oldaplib/src/xsd/xsd_unsignedbyte.py,sha256=Nro864cBM_Su7dwY_UXvGBwItsqy9jwuZffy
 oldaplib/src/xsd/xsd_unsignedint.py,sha256=q4qN706kocmMoQemg1ayig3tM26emvK8crFphZPZzqs,1041
 oldaplib/src/xsd/xsd_unsignedlong.py,sha256=5fGH8_SAV1x6b0YGiIR44ZlJXjUiCUW6XHhCWbGgcVA,1008
 oldaplib/src/xsd/xsd_unsignedshort.py,sha256=M1E8SDR33rPJ0jUpRkzcDCcJYg17YfVbaItTuJeEibc,1013
+oldaplib/test/XXX_test_fasnacht.py,sha256=BH_0osp1LpyXNWjU_OPXvpT7RyF9aeYMrPIa1JiQKiA,573
 oldaplib/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/test/test_cache.py,sha256=6TGukPUruuj5BsZaPGZdIx9L7v39qB9jIKZkg_GkbW4,702
-oldaplib/test/test_connection.py,sha256=y_t0v9jbo1BFsDlAjei2ckG0iVnLNc4ShlIRxe8GMvg,13386
-oldaplib/test/test_context.py,sha256=atESRnIStobqkydjpVnmpHrcmf6QD9rgEwAZCsHlnXI,4757
-oldaplib/test/test_datamodel.py,sha256=mzDMN3X_o6_iLdBJANre41nRlj_C4bq61HKFZuvfk3w,59025
+oldaplib/test/test_connection.py,sha256=wM2AWcwcNcd1_W857by_QKmdnEabsOcjOec-8JrfHdc,13339
+oldaplib/test/test_context.py,sha256=3tjZ8r4ieePs3CTqKxWVMynWBo_bpna_VYYRsthRH7w,4888
+oldaplib/test/test_datamodel.py,sha256=Ju0PWCoT3ZqleEYNRJFaznuE4vRlhlaCxa_Fw_WgG4c,58942
 oldaplib/test/test_dtypes.py,sha256=ifXWUc6ExAKGukyM1ziku7Xd9eehg4J7HZy9B63-aPo,8601
-oldaplib/test/test_externalontologies.py,sha256=eExlaKUTsbm1dou_By4_T_qL0iuH5L96v3sjpTYYLWQ,7844
-oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h4fjM,11572
+oldaplib/test/test_externalontologies.py,sha256=WUPjTbklMmrM4OucPXOChyNmwFD9qdYVKkZyo0WHlP0,7797
+oldaplib/test/test_hasproperty.py,sha256=jVagmFXjfEfdbfzkD_KZjjNIVoSr06feWlO9I4NuT90,11525
 oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3jaZx4,7779
 oldaplib/test/test_langstring.py,sha256=37BeKiQzj63G-SyS_paK_SEG7ulRbGrE89Mz40UB_bE,15146
 oldaplib/test/test_language_in.py,sha256=ELqHO-YIsZSCPF3E3rWde4J7rERL7En7sV_pzQ00zgs,8826
-oldaplib/test/test_objectfactory.py,sha256=fp3xr6gh5rGcLubY5jMjZFbAVNtJfibPt1Q5-XCtBmk,39255
+oldaplib/test/test_objectfactory.py,sha256=VeQJBWH-DVqg1K5XTwlVMOqkXy-OYSUXF0LsVAG4vh8,39281
 oldaplib/test/test_observable_dict.py,sha256=GxD0sM0nsVfVRBu92SFGkJ6--YXq4ibBWI4IpjZZzDU,1396
 oldaplib/test/test_observable_set.py,sha256=JWZSoAsr8XIEBXPVgSVJjQQEEc8uSAme5IrFYLYVVXw,6313
-oldaplib/test/test_oldaplist.py,sha256=9wo3tEOHt5bIuXyvSSyTzjhtdKrQHiiAA6EfVBuq4wI,20114
-oldaplib/test/test_oldaplist_helpers.py,sha256=vJkA_Txhdk4oIwo2YK566yOte2Z6MQkshxPzCAg6k3I,24439
-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=1C2urIKlZV1FwGlsmJMLcrHk1aSeb9dclydzhYlbNqw,61857
-oldaplib/test/test_resourceclass.py,sha256=WQGyns2S8O6vDH8oXBQjcww_VcjIONovuNdKm0coO-c,96621
+oldaplib/test/test_oldaplist.py,sha256=jMM3HiSFs7YcS2ltEvot6637EhK-fMV0W5DSUlFdTRI,20098
+oldaplib/test/test_oldaplist_helpers.py,sha256=sxCPOAYt8JyS-otAMYOiwNMygDX8NXTRe16alkPufQY,24423
+oldaplib/test/test_oldaplistnode.py,sha256=H3Y-DdFfJqk9OzvB0M2jlaMfXHJCVfiFZYuu8P4fa4g,149417
+oldaplib/test/test_permissionset.py,sha256=f43ndsPSZK4yqwxUXDjPgNdQvowJ7b4wfPELqj0zU1Y,23423
+oldaplib/test/test_project.py,sha256=uwMjeYBEnkqmApqxPYPPvCO3XtYn_IFMP_h2ut_u_Tg,25243
+oldaplib/test/test_propertyclass.py,sha256=MaHoTy7o6b3c44whYWTqG0mCOaNvZqL0Mzf7v3ru-Us,61810
+oldaplib/test/test_resourceclass.py,sha256=c4x7Py3a6zTKypGPfW-KgZNRXT4jeikARq3290jZ-GE,96575
 oldaplib/test/test_semantic_version.py,sha256=OSJYHWDpKBqk-HsxJ2nFpSr14a4OEZTFCogzEni8mcE,3392
-oldaplib/test/test_user.py,sha256=gLTcQ0ymi9pYPPpq9BOY_3YS07EJXtnJKFCHe4Rj0mQ,72133
-oldaplib/test/test_xsd_datatypes.py,sha256=K4bJv4G12EG3VeOzMYU_4oQrKuiUpRmRDEZTrHPKmSE,67943
+oldaplib/test/test_user.py,sha256=w_Ud7kh5nWjnsvnCYj7pP1mH7Fp2rP-nUCDAN5Lrz64,72086
+oldaplib/test/test_xsd_datatypes.py,sha256=Ey2RMMs9a3cNlFe4PHTGcLl5MRlkPBxJTid1NLSe-yg,67959
 oldaplib/testdata/Gender.yaml,sha256=54ohJWToiuO2rMOUJ85JOsZf2TSrIuPLarHriXa6Lww,235
 oldaplib/testdata/collections_type.yaml,sha256=03MNQVUoLlq7A1OOtSvACeRs32VfP5eS8av-mPLGoEI,2737
 oldaplib/testdata/connection_test.trig,sha256=LFTGLEae7SaTU67rwvgvg_epi09O7oPZwfarvBVbhho,23078
@@ -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.27.dist-info/METADATA,sha256=4DqyLUib3AebLY5qQ-rrMEtAWerOqtiflSq4rKdkdc0,3010
-oldaplib-0.3.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.27.dist-info/RECORD,,
+oldaplib-0.3.28.dist-info/METADATA,sha256=F5M8jRtM6Rdj0zA8sDJ57lnkjkjMA4yUa8XlZ31XE5U,3010
+oldaplib-0.3.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.28.dist-info/RECORD,,

oldaplib/apps/load_list.py

@@ -1,45 +0,0 @@
-import sys
-from argparse import ArgumentParser
-from pathlib import Path
-
-from oldaplib.src.connection import Connection
-from oldaplib.src.helpers.oldaperror import OldapError
-from oldaplib.src.oldaplist_helpers import load_list_from_yaml, print_sublist
-from oldaplib.src.project import Project
-
-
-def load_list():
-    parser = ArgumentParser(prog="load_list",
-                            description="Loads YAML file with hierarchical list.")
-    parser.add_argument("file", help="YAML file with hierarchical list")
-    parser.add_argument('-v', '--verbose', action='store_true', help="Show some informational output")
-    parser.add_argument('-u', '--user', required=True, help="Username")
-    parser.add_argument('-p', '--password', required=True, help="Password")
-    parser.add_argument('--project', required=True, help="Project ID")
-    #parser.add_argument('-h', '--help', help="Show help information")
-    args = parser.parse_args()
-
-    try:
-        connection = Connection(server='http://localhost:7200',
-                                repo="oldap",
-                                userId=args.user,
-                                credentials=args.password,
-                                context_name="DEFAULT")
-        project = Project.read(connection, args.project)
-        path = Path(args.file)
-        listnodes = load_list_from_yaml(con=connection,
-                                        project=args.project,
-                                        filepath=path)
-        if args.verbose:
-            listnode = listnodes[0]
-            print_sublist(listnode.nodes)
-    except OldapError as error:
-        print(f'ERROR: {error}!', file=sys.stderr)
-        exit(-1)
-    except FileNotFoundError as error:
-        print(f'ERROR: {error}!', file=sys.stderr)
-        exit(-1)
-
-
-if __name__ == '__main__':
-    load_list()