oldaplib 0.4.0__tar.gz → 0.4.1__tar.gz

{oldaplib-0.4.0 → oldaplib-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.4.0
+Version: 0.4.1
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.4.0 → oldaplib-0.4.1}/oldaplib/src/enums/datapermissions.py

@@ -80,11 +80,14 @@ class DataPermission(PermissionWithValue):
     DATA_DELETE = ('oldap:DATA_DELETE', 5)  # Allow to delete complete resource
     DATA_PERMISSIONS = ('oldap:DATA_PERMISSIONS', 6)  # Allow to modify permissions of resource
 
+    def __str__(self) -> str:
+        return self.to_string()
+
     @property
     def toRdf(self):
         return self.value
 
-    def to_string(self):
+    def to_string(self) -> str:
         return self.name.removeprefix("oldap:")
 
     @classmethod

{oldaplib-0.4.0 → oldaplib-0.4.1}/oldaplib/src/objectfactory.py

@@ -127,6 +127,7 @@ class ResourceInstance:
                         # we have an attachedToRole property given in the constructor...
                         #
                         value = kwargs[str(prop_iri)] if kwargs.get(str(prop_iri)) else kwargs[prop_iri.fragment]
+                        value = {Xsd_QName(role): dperm if isinstance(dperm, DataPermission) else DataPermission.from_string(dperm) for role, dperm in value.items()}
                         if not isinstance(value, dict):
                             raise OldapErrorValue(f'{self.name}: Property {prop_iri} with attachedToRole must be a dict')
                         self._attached_roles = ObservableDict(value, on_change=self.__attachedToRole_cb)

{oldaplib-0.4.0 → oldaplib-0.4.1}/oldaplib/src/user.py

@@ -892,49 +892,55 @@ class User(Model):
             # oldap:hasDefaultDataPermission has changed!
             #
             rdfstar = False
-            sparql = f'{blank:{indent * indent_inc}}# RDF*Star <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
-            sparql += f'{blank:{indent * indent_inc}}WITH oldap:admin\n'
+            sparql = ''
+            if removed or changed:
+                sparql += f'{blank:{indent * indent_inc}}# RDF*Star DELETE: <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
+                sparql += f'{blank:{indent * indent_inc}}DELETE DATA {{\n'
+                sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
+                rdfstar = True
             if removed:
                 tmp = [role for role, dperm in removed.items() if dperm] # check if we have roles with dterm not None
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}DELETE {{\n'
                     for role, dperm in removed.items():
                         if dperm:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
-                    rdfstar = True
+                            sparql += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm.toRdf} .\n'
             if changed:  # remove RDF*Star triples of the roles that have changed
                 tmp = [role for role, dperm in changed.items() if dperm['old']]
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}DELETE {{\n'
                     for role, changes in changed.items():
                         if changes['old']:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["old"]} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
-                    rdfstar = True
+                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["old"].toRdf} .\n'
+
+            if rdfstar:
+                sparql += f'{blank:{(indent + 1) * indent_inc}}}}\n'
+                sparql += f'{blank:{indent * indent_inc}}}}\n'
+            if added or changed:
+                if rdfstar:
+                    sparql += f'{blank:{indent * indent_inc}};\n'
+                sparql += f'{blank:{indent * indent_inc}}# RDF*Star INSERT: <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
+                sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{\n'
+                sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
+                rdfstar = True
+            else:
+                rdfstar = False
             if added:
                 tmp = [role for role, dperm in added.items() if dperm]  # check if we have roles with dterm not None
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}INSERT {{\n'
                     for role, dperm in added.items():
                         if dperm:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
+                            sparql += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm.toRdf} .\n'
                     rdfstar = True
             if changed:  # add the RDF*Star triples of the roles that have changed
                 tmp = [role for role, dperm in changed.items() if dperm['new']]
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}INSERT {{\n'
                     for role, changes in changed.items():
                         if changes['new']:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["new"]} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
+                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["new"].toRdf} .\n'
                     rdfstar = True
-            sparql += f'{blank:{indent * indent_inc}}WHERE {{\n'
-            sparql += f'{blank:{(indent + 1) * indent_inc}}BIND({self.userIri.toRdf} as ?user)\n'
-            sparql += f'{blank:{(indent + 1) * indent_inc}}?user a oldap:User .\n'
-            sparql += f'{blank:{indent * indent_inc}}}}'
             if rdfstar:
+                sparql += f'{blank:{(indent + 1) * indent_inc}}}}\n'
+                sparql += f'{blank:{indent * indent_inc}}}}\n'
+            if sparql:
                 sparql_list.append(sparql)
 
             #
@@ -1115,6 +1121,7 @@ class User(Model):
             self.set_modified_by_iri(Xsd_QName('oldap:admin'), self.userIri, self.modified, timestamp)
             modtime = self.get_modified_by_iri(Xsd_QName('oldap:admin'), self.userIri)
         except OldapError:
+            print(sparql)
             self._con.transaction_abort()
             raise
         if timestamp != modtime:

oldaplib-0.4.1/oldaplib/src/version.py

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

{oldaplib-0.4.0 → oldaplib-0.4.1}/oldaplib/test/test_user.py

@@ -699,6 +699,7 @@ class TestUser(unittest.TestCase):
                                                          AdminPermission.ADMIN_CREATE}},
                     hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
+
         user2 = User.read(con=self._connection, userId="edison", ignore_cache=True)
         user2.userId = "aedison"
         user2.familyName = "Edison et al."

{oldaplib-0.4.0 → oldaplib-0.4.1}/pyproject.toml

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

oldaplib-0.4.0/oldaplib/src/version.py

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