oldaplib 0.4.2__tar.gz → 0.4.4__tar.gz

{oldaplib-0.4.2 → oldaplib-0.4.4}/PKG-INFO

@@ -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 → oldaplib-0.4.4}/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-0.4.2 → oldaplib-0.4.4}/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-0.4.4/oldaplib/src/version.py

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

{oldaplib-0.4.2 → oldaplib-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-0.4.2 → oldaplib-0.4.4}/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 → oldaplib-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.4.2"
+version = "0.4.4"
 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"
@@ -30,18 +30,19 @@ bcrypt = "==5.0.0"
 mkdocs = "^1.5.3"
 setuptools = "^80.9.0"
 lazydocs = "^0.4.8"
-mkdocstrings = "^0.30.0"
-mkdocstrings-python = "^1.17.0"
+mkdocstrings = "==1.0.1"
+mkdocstrings-python = "==2.0.1"
 pyjwt = "^2.8.0"
 coverage = "^7.10.7"
 validators = "^0.35.0"
-mkdocs-material = "==9.6.21"
+mkdocs-material = "==9.7.1"
 pymdown-extensions = "^10.10.2"
 pyyaml = "^6.0.2"
 yamale = "^6.0.0"
 redis = "^6.4.0"
 cloudpickle = "^3.1.1"
 bump2version = "^1.0.1"
+oldap-tools = "^0.1.2"
 
 
 [build-system]

oldaplib-0.4.2/oldaplib/src/version.py

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