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

oldaplib/src/oldaplist_helpers.py

@@ -150,7 +150,7 @@ def dump_list_to(con: IConnection,
                     make_dict(node, listdict[str(listnode.oldapListNodeId)]['nodes'])
 
     #
-    # We need to get the OldapList IRI for aksing the cache...
+    # We need to get the OldapList IRI for asking the cache...
     #
     if not isinstance(project, Project):
         project = Project.read(con, project)

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.29"

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

@@ -5,6 +5,7 @@ import unittest
 from pathlib import Path
 from pprint import pprint
 from time import sleep
+import jwt
 
 from oldaplib.src.cachesingleton import CacheSingletonRedis
 from oldaplib.src.datamodel import DataModel
@@ -108,8 +109,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 +361,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 +547,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):
@@ -703,22 +703,78 @@ class TestObjectFactory(unittest.TestCase):
         self.assertEqual(len(res), 8)
 
     #@unittest.skip('Work in progress')
-    def test_read_media_object(self):
-        res = ResourceInstance.get_media_object_by_id(con=self._connection,mediaObjectId='x_34db.tif')
+    def test_read_media_object_by_id_A(self):
+        res = ResourceInstance.get_media_object_by_id(con=self._connection, mediaObjectId='x_34db.tif')
+        self.assertEqual(res['iri'], Iri("urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b901"))
+        self.assertEqual(res['permval'], Xsd_integer(2))
+        self.assertEqual(res['shared:imageId'], Xsd_string('x_34db.tif'))
+        self.assertEqual(res['shared:originalName'], Xsd_string("testfile.tif"))
+        self.assertEqual(res['shared:originalMimeType'], Xsd_string("image/tiff"))
+        self.assertEqual(res['shared:serverUrl'], Xsd_string("https://iiif.oldap.org"))
+        self.assertEqual(res['shared:protocol'], Xsd_string("iiif"))
+        self.assertEqual(res['graph'], Xsd_QName("test:data"))
+        self.assertEqual(res['shared:path'], Xsd_string("test/subtest"))
+        tinfo = jwt.decode(jwt=res['token'], key=self._connection.jwtkey, algorithms="HS256")
+        self.assertEqual(tinfo['id'], 'x_34db.tif')
+        self.assertEqual(tinfo['path'], 'test/subtest')
+        self.assertEqual(tinfo['permval'], '2')
+
+    def test_read_media_object_by_id_B(self):
+        res = ResourceInstance.get_media_object_by_id(con=self._connection, mediaObjectId='x_42db.jpg')
+        self.assertEqual(res['iri'], Iri("urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b999"))
+        self.assertEqual(res['permval'], Xsd_integer(2))
+        self.assertEqual(res['shared:imageId'], Xsd_string('x_42db.jpg'))
+        self.assertEqual(res['shared:originalName'], Xsd_string("testfile.jpg"))
+        self.assertEqual(res['shared:originalMimeType'], Xsd_string("image/jpeg"))
+        self.assertEqual(res['shared:serverUrl'], Xsd_string("https://iiif.oldap.org"))
+        self.assertEqual(res['shared:protocol'], Xsd_string("iiif"))
+        self.assertEqual(res['graph'], Xsd_QName("test:data"))
+        self.assertEqual(res['test:caption'], [Xsd_string("This is a non-real, non-existing image")])
+        self.assertEqual(res['shared:path'], Xsd_string("test/subtest"))
+        tinfo = jwt.decode(jwt=res['token'], key=self._connection.jwtkey, algorithms="HS256")
+        self.assertEqual(tinfo['id'], 'x_42db.jpg')
+        self.assertEqual(tinfo['path'], 'test/subtest')
+        self.assertEqual(tinfo['permval'], '2')
+
+    def test_read_media_object_by_iri_A(self):
+        res = ResourceInstance.get_media_object_by_iri(con=self._connection, mediaObjectIri='urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b901')
         self.assertEqual(res['iri'], Iri("urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b901"))
+        self.assertEqual(res['permval'], Xsd_integer(2))
+        self.assertEqual(res['shared:imageId'], Xsd_string('x_34db.tif'))
         self.assertEqual(res['shared:originalName'], Xsd_string("testfile.tif"))
         self.assertEqual(res['shared:originalMimeType'], Xsd_string("image/tiff"))
         self.assertEqual(res['shared:serverUrl'], Xsd_string("https://iiif.oldap.org"))
         self.assertEqual(res['shared:protocol'], Xsd_string("iiif"))
         self.assertEqual(res['graph'], Xsd_QName("test:data"))
         self.assertEqual(res['shared:path'], Xsd_string("test/subtest"))
-        self.assertEqual(res['oldap:permissionValue'], Xsd_integer(2))
+        tinfo = jwt.decode(jwt=res['token'], key=self._connection.jwtkey, algorithms="HS256")
+        self.assertEqual(tinfo['id'], 'x_34db.tif')
+        self.assertEqual(tinfo['path'], 'test/subtest')
+        self.assertEqual(tinfo['permval'], '2')
+
+    def test_read_media_object_by_iri_B(self):
+        res = ResourceInstance.get_media_object_by_iri(con=self._connection, mediaObjectIri='urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b999')
+        self.assertEqual(res['iri'], Iri("urn:uuid:1b8e3f42-6d7a-4c9b-a3f8-93c2e5d7b999"))
+        self.assertEqual(res['permval'], Xsd_integer(2))
+        self.assertEqual(res['shared:imageId'], Xsd_string('x_42db.jpg'))
+        self.assertEqual(res['shared:originalName'], Xsd_string("testfile.jpg"))
+        self.assertEqual(res['shared:originalMimeType'], Xsd_string("image/jpeg"))
+        self.assertEqual(res['shared:serverUrl'], Xsd_string("https://iiif.oldap.org"))
+        self.assertEqual(res['shared:protocol'], Xsd_string("iiif"))
+        self.assertEqual(res['graph'], Xsd_QName("test:data"))
+        self.assertEqual(res['test:caption'], [Xsd_string("This is a non-real, non-existing image")])
+        self.assertEqual(res['shared:path'], Xsd_string("test/subtest"))
+        tinfo = jwt.decode(jwt=res['token'], key=self._connection.jwtkey, algorithms="HS256")
+        self.assertEqual(tinfo['id'], 'x_42db.jpg')
+        self.assertEqual(tinfo['path'], 'test/subtest')
+        self.assertEqual(tinfo['permval'], '2')
 
     def test_create_media_object(self):
         dm = DataModel.read(con=self._connection, project='test')
         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?')