oldaplib 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

oldaplib/src/helpers/langstring.py

@@ -418,6 +418,13 @@ class LangString(Notify):
                         f'LangString parameter has wrong datatype: {type(langstring).__name__}, must be "str | Xsd_string | List[str] | Dict[Language | str, str] | LangString"')
         self.notify()
 
+    def remove(self, lang: Language | str):
+        self.__delitem__(lang)
+
+    def discard(self, lang: Language | str):
+        if self.get(lang) is not None:
+            self.__delitem__(lang)
+
     def undo(self) -> None:
         """
         Undo all changes made since last update/creation/read

oldaplib/src/objectfactory.py

@@ -1,5 +1,6 @@
 import re
 import textwrap
+from pprint import pprint
 
 import jwt
 
@@ -212,16 +213,13 @@ class ResourceInstance:
         self.clear_changeset()
 
     def __setitem__(self, key: Xsd_QName, value: ValueType | Xsd | None):
-        if self._values.get(key):
-            self.__set_value(value, key)
-        else:
-            raise OldapErrorValue(f'{self.name}: Property {key} does not exist.')
+        self.__set_value(value, key)
 
     def __getitem__(self, key: Xsd_QName) -> ValueType | Xsd | None:
         if self._values.get(key):
             return self.__get_value(key)
         else:
-            raise OldapErrorValue(f'{self.name}: Property {key} does not exist.')
+            raise OldapErrorValue(f'{self.name}: __getitem__: Property {key} does not exist.')
 
     def __delitem__(self, key: Xsd_QName):
         if self._values.get(key):
@@ -465,7 +463,7 @@ class ResourceInstance:
                 self.validate_value(value, hasprop.prop)
             else:
                 if isinstance(value, (list, tuple, set, ObservableSet)):
-                    for val in self._values[attr]:
+                    for val in value:
                         self.validate_value(val, hasprop.prop)
                 else:
                     self.validate_value(value, hasprop.prop)
@@ -1076,7 +1074,7 @@ class ResourceInstance:
                     continue
                 if not data.get(r['predicate'].as_qname):
                     data[r['predicate'].as_qname] = []
-                data[str(r['predicate'].as_qname)].append(str(r['value']))
+                data[str(r['predicate'].as_qname)].append(r['value'])
             else:
                 raise OldapErrorInconsistency(f"Expected QName as predicate, got {r['predicate']}")
         if not data.get('rdf:type'):

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.4.4"

oldaplib/src/xsd/iri.py

@@ -246,6 +246,10 @@ class Iri(Xsd):
         parts = self.__value.split(':')
         return parts[1]
 
+    @property
+    def value(self) -> str:
+        return self.__value
+
 
 if __name__ == '__main__':
     #iri = Iri("oldap:HyperHamlet\".}\nSELECT * WHERE{?s ?p ?s})#")

oldaplib/test/test_objectfactory.py

@@ -18,7 +18,8 @@ from oldaplib.src.enums.language import Language
 from oldaplib.src.helpers.attributechange import AttributeChange
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.helpers.langstring import LangString
-from oldaplib.src.helpers.oldaperror import OldapErrorNotFound, OldapErrorValue, OldapErrorNoPermission, OldapErrorInUse
+from oldaplib.src.helpers.oldaperror import OldapErrorNotFound, OldapErrorValue, OldapErrorNoPermission, \
+    OldapErrorInUse, OldapErrorKey
 from oldaplib.src.role import Role
 from oldaplib.src.project import Project
 from oldaplib.src.user import User
@@ -613,6 +614,129 @@ class TestObjectFactory(unittest.TestCase):
 
         obj1.delete()
 
+    def test_value_modifier_C(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        obj1[Xsd_QName('test:integerSetter')] = [1]
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.integerSetter, {Xsd_int(1)})
+
+    def test_value_modifier_add_lang(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        obj1[Xsd_QName('test:langStringSetter')].add("Dies ist eine Test-Zeichenkette@de")
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"))
+
+    def test_value_modifier_remove_lang_A(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        del obj1[Xsd_QName('test:langStringSetter')]['de']
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("C'est un teste@fr"))
+
+    def test_value_modifier_remove_lang_B(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        obj1[Xsd_QName('test:langStringSetter')].remove(Language.DE)
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("C'est un teste@fr"))
+
+    def test_value_modifier_remove_lang_D(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        obj1[Xsd_QName('test:langStringSetter')].discard(Language.EN)
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("Waseliwas@de", "C'est un teste@fr"))
+
+        with self.assertRaises(OldapErrorKey):
+            obj1[Xsd_QName('test:langStringSetter')].remove(Language.EN)
+
+    def test_value_modifier_replace(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1[Xsd_QName('test:langStringSetter')] = LangString("FRANCAIS@fr", "DEUTSCH@de")
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("FRANCAIS@fr", "DEUTSCH@de"))
+
+
+    def test_value_modifier_delete_A(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            integerSetter={20200, 30300},
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1[Xsd_QName('test:integerSetter')] = None
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertIsNone(obj1.integerSetter)
+
+    def test_value_modifier_delete_B(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            integerSetter={20200, 30300},
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        del obj1[Xsd_QName('test:integerSetter')]
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertIsNone(obj1.integerSetter)
+
     def test_value_maxcount_mincount(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         Person = factory.createObjectInstance('Person')

{oldaplib-0.4.2.dist-info → oldaplib-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.4.2
+Version: 0.4.4
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler
@@ -16,9 +16,10 @@ Requires-Dist: coverage (>=7.10.7,<8.0.0)
 Requires-Dist: isodate (>=0.7.2,<0.8.0)
 Requires-Dist: lazydocs (>=0.4.8,<0.5.0)
 Requires-Dist: mkdocs (>=1.5.3,<2.0.0)
-Requires-Dist: mkdocs-material (==9.6.21)
-Requires-Dist: mkdocstrings (>=0.30.0,<0.31.0)
-Requires-Dist: mkdocstrings-python (>=1.17.0,<2.0.0)
+Requires-Dist: mkdocs-material (==9.7.1)
+Requires-Dist: mkdocstrings (==1.0.1)
+Requires-Dist: mkdocstrings-python (==2.0.1)
+Requires-Dist: oldap-tools (>=0.1.2,<0.2.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
 Requires-Dist: pymdown-extensions (>=10.10.2,<11.0.0)
 Requires-Dist: pyshacl (>=0.30.1,<0.31.0)

{oldaplib-0.4.2.dist-info → oldaplib-0.4.4.dist-info}/RECORD

@@ -50,7 +50,7 @@ oldaplib/src/helpers/context.py,sha256=qWv0E_MQKzXYLIt3thd65jfgvPjNL-KQ7RzYirhtY
 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
-oldaplib/src/helpers/langstring.py,sha256=KfyYisMKEYstv-CUPlKkjMg9fbTjrOV3IDn2HOUfdtY,30350
+oldaplib/src/helpers/langstring.py,sha256=PqHeHez81wGime2HbI4YE6d4XGsD45SUG660kyq2wXU,30546
 oldaplib/src/helpers/numeric.py,sha256=swRKU51zbwss9UDGTC6FzhTTPK_BVfy5On0KCK-zZnQ,966
 oldaplib/src/helpers/observable_dict.py,sha256=_7wYzMtna6hjngLCF-8iOYdaXztGappBZ5Jkm26FEoE,3336
 oldaplib/src/helpers/observable_set.py,sha256=aqBtZFLSG32NSFXNNYGE7RyGj0QmL2O35Khj1asnRYc,14495
@@ -64,7 +64,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=wgvXaR2GVHk4hJxoL6rigFHwjPYEukBOjtf1Jmo-m9A,19326
-oldaplib/src/objectfactory.py,sha256=3xzXXVRBLernA-JD3NHZ2-FLaywWI6opWIaJfLGv2uk,85975
+oldaplib/src/objectfactory.py,sha256=4pPzsbbjnmtAobMH4ZIazwFZVzCuOd8MZWCZ2lZgOz8,85862
 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
@@ -75,10 +75,10 @@ oldaplib/src/resourceclass.py,sha256=zJNWNY1TfhGs-A2HNa1DO0KAajps_1jMQsoEkUsr7P0
 oldaplib/src/role.py,sha256=AWtZx80OVERT2xbKeuP8g32VSXkm4MVlzeUWd9nh6mQ,30741
 oldaplib/src/user.py,sha256=iTJzSvR0xfc3FFkoKG-q5LptkWB_PGpRGpG-L3271z8,55833
 oldaplib/src/userdataclass.py,sha256=4kWktau9XSv5alfEVuOvikfxnSSUSKT8cw77TWdMhQM,13921
-oldaplib/src/version.py,sha256=Y-I6FXKes4hB39WcBm3HZ1OCtCWiErPB6YZ-YSgexuE,21
+oldaplib/src/version.py,sha256=xw_dYipbaGm6aV2OPgH234_ODRnMNhDWYLau1HFUaAQ,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
+oldaplib/src/xsd/iri.py,sha256=VrM1rgs-DKEuYLI8SUBp7QWMEZbxzxoUcvFKKfqY7mA,8454
 oldaplib/src/xsd/xsd.py,sha256=KiAIhqE7y5s7rPZWxA8eP-1Spf_saFOndNznaWOKSbM,1550
 oldaplib/src/xsd/xsd_anyuri.py,sha256=tsZfOpIlsomQubywMmXzgoX-LvtQ7hBdfP7TrGpW7Xk,6244
 oldaplib/src/xsd/xsd_base64binary.py,sha256=beHouGagNdqTxH7MHh03YKuErlHx4qSjmBrKdGB6sTU,3930
@@ -131,7 +131,7 @@ oldaplib/test/test_hasproperty.py,sha256=cU9t7uBaMxtIVbpk3UyGjPyIzQKDSS2PzqGHIIN
 oldaplib/test/test_in_project.py,sha256=OV5csuPwxcctmOM2HsB_ITmXXASRcH9-A2GlWW5foa4,7580
 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=QJ4di0qJ48tVC3wPELSGMt4KoYb7wPpyk2BS-Efb2PY,48317
+oldaplib/test/test_objectfactory.py,sha256=znSEy7VagIU6tcgXyw91aPMxjFNS8Nc7Ne3sJALhpno,55447
 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=jMM3HiSFs7YcS2ltEvot6637EhK-fMV0W5DSUlFdTRI,20098
@@ -164,6 +164,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.2.dist-info/METADATA,sha256=8sOUpxHNqa4-ldp3AtofTxcuXhIaChtz8HN5NfC-nmM,3009
-oldaplib-0.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.4.2.dist-info/RECORD,,
+oldaplib-0.4.4.dist-info/METADATA,sha256=reDfpmF7HkkCVNeb8Km1O35lldWvA2QX7YMK-SnfK6w,3035
+oldaplib-0.4.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.4.4.dist-info/RECORD,,