oldaplib 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

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/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/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/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "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.dist-info → oldaplib-0.4.1.dist-info}/METADATA

@@ -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.dist-info → oldaplib-0.4.1.dist-info}/RECORD

@@ -21,7 +21,7 @@ oldaplib/src/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 oldaplib/src/enums/action.py,sha256=aL7XXmoZ63_L2TTR37vqHpPPf5H_kYiPunNyiSDN28U,828
 oldaplib/src/enums/adminpermissions.py,sha256=nn76g2E8TIhkiVbZ64LGt81NuPwFXIDRISKBV6l9dyM,1969
 oldaplib/src/enums/attributeclass.py,sha256=Lc7OnMMl9vjXj0SuL0l30iEjwC3oWDv_C8PFeTavDGc,3006
-oldaplib/src/enums/datapermissions.py,sha256=K6fEHstkuQPrQAmz1oFF-dz6lumLFd3Tb1njdgQwg4A,4034
+oldaplib/src/enums/datapermissions.py,sha256=MiaVHXzNDKTGnZJ9pvs-IgQotyV4wA3X484s2RVMOvs,4104
 oldaplib/src/enums/externalontologyattr.py,sha256=H7SrWrhe1Dkz_t1OFCWZVh3_14lJDltYGh3dOFr1Z6w,807
 oldaplib/src/enums/haspropertyattr.py,sha256=Pwi-520nxue3s1fku9x4FNFBOOKSbYVI9MTVGD5jaeU,726
 oldaplib/src/enums/language.py,sha256=OfQsFpIBj8lGBbZEqVCR_1F-bimPM48vqBl4EKBgggY,4623
@@ -59,7 +59,7 @@ oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=ZnfeOFwpdPh1oyC2mAGH8DnSD9afxYtvsh7_GrfGVgQ,10663
 oldaplib/src/model.py,sha256=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
-oldaplib/src/objectfactory.py,sha256=V7q6RVEY9HL1y_Qn3OAcYql3Nvv8JvJ7Fox4xbgAACw,85809
+oldaplib/src/objectfactory.py,sha256=3xzXXVRBLernA-JD3NHZ2-FLaywWI6opWIaJfLGv2uk,85975
 oldaplib/src/oldaplist.py,sha256=s5afrHtUnvDfMUFoZTt-jMxlBlmK2c0tLeTMp0KiIfg,43077
 oldaplib/src/oldaplist_helpers.py,sha256=D_X7KdFjPNlX-OwR04D6onxhFucrGo8052WuJPRjLkA,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -68,9 +68,9 @@ oldaplib/src/project.py,sha256=ic0cIYYcPk--7XsfbymuGkFbiUFmFJqNgjTWY2Rws7Q,35266
 oldaplib/src/propertyclass.py,sha256=ez_AyaX_UMIFgSW0msmhOtxXdSB6__pyxVID7Mi6OxU,97241
 oldaplib/src/resourceclass.py,sha256=E_CT3MKgFyLUtvtrUtRU7sV5s0TPwxEb6l74PsnbgrI,103724
 oldaplib/src/role.py,sha256=AWtZx80OVERT2xbKeuP8g32VSXkm4MVlzeUWd9nh6mQ,30741
-oldaplib/src/user.py,sha256=S5lNqPt0vcagHt2sTuz07GzdisTndNLN1fdRH_PQbYY,55647
+oldaplib/src/user.py,sha256=iTJzSvR0xfc3FFkoKG-q5LptkWB_PGpRGpG-L3271z8,55833
 oldaplib/src/userdataclass.py,sha256=4kWktau9XSv5alfEVuOvikfxnSSUSKT8cw77TWdMhQM,13921
-oldaplib/src/version.py,sha256=1NSg4yHgqJJKYBklxFwmel_5eSNX51umiqsyFgx4770,21
+oldaplib/src/version.py,sha256=IfrBKs_W4usv6LOPMiFXYlA5wFjjr8eb0zFW3FWiUtM,21
 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
@@ -138,7 +138,7 @@ oldaplib/test/test_propertyclass.py,sha256=MaHoTy7o6b3c44whYWTqG0mCOaNvZqL0Mzf7v
 oldaplib/test/test_resourceclass.py,sha256=CmCw06meGsLX9-GM_opSf_HyD-Oc_2NQjH1wuhK2lds,96552
 oldaplib/test/test_role.py,sha256=mr4uNkamfb8T8ehyMf2dfPCXmxe7lvZPdhE-hdB_QN4,19815
 oldaplib/test/test_semantic_version.py,sha256=OSJYHWDpKBqk-HsxJ2nFpSr14a4OEZTFCogzEni8mcE,3392
-oldaplib/test/test_user.py,sha256=5KJsoI6n0muQmKB9Z0Av2eTadLe_RiNmWbITPGtg38g,76599
+oldaplib/test/test_user.py,sha256=S34Y36xz6zgmVkVZf8tg_LkFbw3XkstunjmpjvOa7Fw,76600
 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
@@ -159,6 +159,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.4.0.dist-info/METADATA,sha256=1V3ZQ_8Bfm5xczbHFhnjFZZrtOeTFnFgKymXd13Mf74,3009
-oldaplib-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.4.0.dist-info/RECORD,,
+oldaplib-0.4.1.dist-info/METADATA,sha256=Lg8EVleImQ28gOXy0FCGdbeqV4GQLAA-_g_yoXlKtfg,3009
+oldaplib-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.4.1.dist-info/RECORD,,