oldaplib 0.3.27__tar.gz → 0.3.28__tar.gz

{oldaplib-0.3.27 → oldaplib-0.3.28}/PKG-INFO

@@ -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 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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-0.3.27 → oldaplib-0.3.28}/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'