oldaplib 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

oldaplib/src/helpers/observable_dict.py

@@ -16,14 +16,39 @@ class ObservableDict(UserDict):
     def __init__(self,
                  obj: Iterable | Mapping | None = None, *,
                  on_change: Callable[[Self], None] | None = None,
+                 obsdict: dict | None = None,
                  validate: bool = False,
                  **kwargs):
+        """
+        Initializes a new instance of the class with optional data and settings for
+        notifications and validation.
+
+        :param obj: An optional iterable or mapping containing initial data for the
+            instance. Defaults to None.
+        :type obj: Iterable | Mapping | None
+        :param on_change: A callable function that will be invoked when a change is made
+            to the instance. The function is passed the instance itself as an argument.
+            Defaults to None.
+        :type on_change: Callable[[Self], None] | None
+        :param obsdict: This is used in conjunction with the method _as_dict to serialize
+            the instance's data to JSON and back. It preserves the dataclasses also of the keys.
+            *NOTE": It should never be used directly – it's reserved for the @serializer decorator.
+        :type obsdict: dict | None
+        :param validate: A boolean flag indicating whether to enforce validation checks
+            on the data. Defaults to False.
+        :type validate: bool
+        :param kwargs: Additional keyword arguments forwarded to the superclass
+            initializer.
+        """
         self.__on_change = on_change
         self._changeset = {}
         if obj:
             super().__init__(obj, **kwargs)
         else:
             super().__init__(**kwargs)
+        if obsdict:
+            for item in obsdict:
+                self[item['key']] = item['val']
 
     def __setitem__(self, key, value):
         if key in self.data:
@@ -48,8 +73,7 @@ class ObservableDict(UserDict):
         self.__on_change = on_change
 
     def _as_dict(self):
-        #return self.data
-        return {str(key): val for key, val in self.data.items()}
+        return {'obsdict': [{'key': key, 'val': val} for key, val in self.data.items()]}
 
     def clear_changeset(self):
         self._changeset = {}

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1"

oldaplib/test/test_observable_dict.py

@@ -24,6 +24,6 @@ class TestObservableDict(unittest.TestCase):
     def test_json(self):
         obs = ObservableDict({Iri('http://gaga.com/a'): 1, Iri('http://gaga.com/b'): 2, Iri('http://gaga.com/c'): 3, Iri('http://gaga.com/d'): 4})
         jsonstr = json.dumps(obs, default=serializer.encoder_default)
-        print(jsonstr)
         obs2 = json.loads(jsonstr, object_hook=serializer.decoder_hook)
+        pass
         self.assertEqual(obs2, {Iri('http://gaga.com/a'): 1, Iri('http://gaga.com/b'): 2, Iri('http://gaga.com/c'): 3, Iri('http://gaga.com/d'): 4})

{oldaplib-0.3.0.dist-info → oldaplib-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.0
+Version: 0.3.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.3.0.dist-info → oldaplib-0.3.1.dist-info}/RECORD

@@ -45,7 +45,7 @@ oldaplib/src/helpers/irincname.py,sha256=0phRZDu8Tw0tT_pcKrdQVFjcvOCPhS3teNp_tbz
 oldaplib/src/helpers/json_encoder.py,sha256=c78h9uf58zfLaK8X7S1KCK4otY3iEltGnPBy_5ryiCk,2135
 oldaplib/src/helpers/langstring.py,sha256=0nQT_63tsZ67YiSgB3R6slb-jzxetWQbpFUWjmAubf0,30170
 oldaplib/src/helpers/numeric.py,sha256=swRKU51zbwss9UDGTC6FzhTTPK_BVfy5On0KCK-zZnQ,966
-oldaplib/src/helpers/observable_dict.py,sha256=d8lDlBhAPoGGBMoUQW-PKjISpV72rekDRxXe4YFH2-c,1761
+oldaplib/src/helpers/observable_dict.py,sha256=Nf-0kWg93oz0PbYNpnK1Iinuw0yJQ_GbYU0BnOviLq4,3074
 oldaplib/src/helpers/observable_set.py,sha256=NKn4JU1wDU-Yp7usbD_rJaYjoD-L7x4dq5x3ra2NSdk,11289
 oldaplib/src/helpers/oldaperror.py,sha256=2gKgV8FYiEjbcox1KN1PlOIPY4KclxVTnCIOQ6Ivvc0,1321
 oldaplib/src/helpers/query_processor.py,sha256=r01_tndB4h6RAeJ2IN3jpz5efv8rSCx1MYAz6DNCQ2Q,10145
@@ -68,7 +68,7 @@ oldaplib/src/propertyclass.py,sha256=fu8pHPgKQJuNYrVcTPkIrX2tCHmcTIFG09KNtbLTj44
 oldaplib/src/resourceclass.py,sha256=6SFF26TxJEmeltr7Qwl7zje3ApWt0h7LcaNVxjFwujg,101408
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=5mDtfU2t04ATmg92S5B-scUcdjCy1ZBq620y3GmpdtQ,21
+oldaplib/src/version.py,sha256=v-ExhFzOD_GemLcOptv2ZODgnklv9iqEEospk_bU1_w,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=tXOuDASdQ6k9KKp2wTO8H4K8yb-_o8jFPanua7wCHog,8269
@@ -124,7 +124,7 @@ oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3ja
 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=F53k5wvpj8rFF8Mn9WOjMRcbTPEqqE0XHm7Zmm7r5go,30740
-oldaplib/test/test_observable_dict.py,sha256=Xfwl9qmyRntrTi_-6QNBymH926LGWK3W2R4rKoKRjbc,1058
+oldaplib/test/test_observable_dict.py,sha256=LZML4I4RwR9EBrssHou0_c-J9m6Zju7nFl7h8JUu6yc,1048
 oldaplib/test/test_observable_set.py,sha256=JWZSoAsr8XIEBXPVgSVJjQQEEc8uSAme5IrFYLYVVXw,6313
 oldaplib/test/test_oldaplist.py,sha256=NNYtaqFrjs8FhUWujM5C52HmXUyaF8ct1CflFUK1zBM,20060
 oldaplib/test/test_oldaplist_helpers.py,sha256=vJkA_Txhdk4oIwo2YK566yOte2Z6MQkshxPzCAg6k3I,24439
@@ -154,6 +154,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.3.0.dist-info/METADATA,sha256=dvDuB2mKgRieYw3MqPjjy2Ay5oNerx3Vh1hos-y1xUc,2803
-oldaplib-0.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.0.dist-info/RECORD,,
+oldaplib-0.3.1.dist-info/METADATA,sha256=oyjJ9ghRAsxaKf5hTuG9cjuzd7EJ3ZhRtOzpWD4cfLU,2803
+oldaplib-0.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.1.dist-info/RECORD,,