moat-kv 0.71.6__py3-none-any.whl → 0.71.7__py3-none-any.whl

moat/kv/command/dump/__init__.py

@@ -15,7 +15,6 @@ from moat.util import (
     yprint,
 )
 
-from moat.util.mqtt import unpacker
 from moat.util.msgpack import StdMsgpack
 
 
@@ -77,19 +76,21 @@ async def msg_(obj, path):
             self._part_cache = dict()
 
     import moat.kv.server
+    cfg = obj.cfg.kv
 
     _Unpack._unpack_multiple = moat.kv.server.Server._unpack_multiple
     _unpacker = _Unpack()._unpack_multiple
+    unpacker = StdMsgpack().decode
 
     path = P(path)
     if len(path) == 0:
-        path = P(obj.cfg.server["root"]) | "update"
+        path = P(cfg.server["root"]) | "update"
     elif len(path) == 1 and path[0].startswith("+"):  # pylint: disable=no-member  # owch
         p = path[0][1:]
-        path = P(obj.cfg.server["root"])
+        path = P(cfg.server["root"])
         path |= p or "#"
-    be = obj.cfg.server.backend
-    kw = obj.cfg.server[be]
+    be = cfg.server.backend
+    kw = cfg.server[be]
 
     async with (
         get_backend(be)(**kw) as conn,
@@ -99,6 +100,7 @@ async def msg_(obj, path):
             v = vars(msg)
             if isinstance(v.get("payload"), (bytearray, bytes)):
                 t = msg.topic
+                breakpoint()
                 v = unpacker(v["payload"])
                 v = _unpacker(v)
                 if v is None:

moat/kv/model.py

@@ -1026,7 +1026,7 @@ class Watcher:
 
     root: Entry = None
     q = None
-    q_len = 100
+    q_len = 10000
 
     def __init__(self, root: Entry, full: bool = False, q_len: int | None = None):
         self.root = root

moat/kv/types.py

@@ -277,18 +277,16 @@ class CodecEntry(Entry):
         if self._enc is not None:
             try:
                 value = self._enc(value, entry=entry, data=self._data, **kv)
-            except TypeError:
-                if value is not None:
-                    raise
+            except (TypeError,ValueError):
+                pass
         return value
 
     def dec_value(self, value, entry=None, **kv):
         if self._dec is not None:
             try:
                 value = self._dec(value, entry=entry, data=self._data, **kv)
-            except TypeError:
-                if value is not None:
-                    raise
+            except (TypeError,ValueError):
+                pass
         return value
 
     async def set(self, value):
@@ -323,8 +321,6 @@ class CodecEntry(Entry):
                     ) from exc
                 else:
                     pass  # float, list/tuple, and similar nonsense
-#                   if r != w:
-#                       raise ValueError(f"Encoding at {self.path}: {v!r} got {r!r}, not {w!r}")
 
         await super().set(value)
         self._enc = enc

{moat_kv-0.71.6.dist-info → moat_kv-0.71.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv
-Version: 0.71.6
+Version: 0.71.7
 Summary: A distributed no-master key-value store
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat_kv-0.71.6.dist-info → moat_kv-0.71.7.dist-info}/RECORD

@@ -7,10 +7,10 @@ moat/kv/config.py,sha256=cWJ1m8PRwzzapsin1XSDjRtYJCgNN6g7gA9q48luDV8,1093
 moat/kv/data.py,sha256=85N2W_pDVRgBn7l9AGdDZHvuHrIPGlbxzgXi_3S0DSI,5924
 moat/kv/errors.py,sha256=cjX0e184EC10HvQ7UOkWdWmc1A8jPr983IFR8UkaI8U,17089
 moat/kv/exceptions.py,sha256=4gRsYa6kuBy1qFYiBUYElup_cvOe7QgPQtryHAYphzo,1849
-moat/kv/model.py,sha256=K2GVQlaFXbwf2JCl-bZi55MTCHFSK7jgomjI7APRIJw,33282
+moat/kv/model.py,sha256=A7J1Zblk5Wu5zKarD60LwxlLukT-iDtFbTPnQZWz0Kc,33284
 moat/kv/runner.py,sha256=6vpChgCjiWHAjc2u0bbOOQ8cT5KB-f4uBnQb8MgH9wk,41826
 moat/kv/server.py,sha256=fwQZNzyJAhqR01d__3hUmEoAD3kgmRfSG0KdESezqpQ,94108
-moat/kv/types.py,sha256=UgUOrF-NUZq2lgKWgUwMdrfPkLIFxdxe-jyYdxeRyVk,14186
+moat/kv/types.py,sha256=aCi7_LXzqwruHbEEDJukOjnXNUC2HUaDbgblN8Q05Rc,13998
 moat/kv/actor/__init__.py,sha256=i560uy9WLE4SmOXWcXKjFKNKZdRR51jOwWg7cSASVRo,2131
 moat/kv/actor/deletor.py,sha256=F-pb0jHddhmqLp65G7vbZ_QIxXu5ZF0UBzHWKRgN45U,4537
 moat/kv/auth/__init__.py,sha256=m1x3tyAIxhaF5jSVC-wEJkntBAG2uERvgN0wRTLnp2w,12572
@@ -31,17 +31,17 @@ moat/kv/command/job.py,sha256=QIiaK0c08CyB-SMjgoWLqa6N3cXQvds0i_w01Q6Jm5I,13590
 moat/kv/command/log.py,sha256=ycdtMgiBw2DaCu0yu6tpWKPLlQ33ZZemXsfwZrCzRGg,1350
 moat/kv/command/server.py,sha256=Hl_6FFq322c5KjJCKxH1nCrxo-h0VEwH4IOMbVeUBN4,3392
 moat/kv/command/type.py,sha256=bQrbJzVo-KWFC69ywA4EsuE_Gp0IT_YpYrgtU6yaW1g,6214
-moat/kv/command/dump/__init__.py,sha256=VLSN8MNHwAe44dmOwieUhzdaPuWCJf5p3XVkMh6PibI,3918
+moat/kv/command/dump/__init__.py,sha256=eF7hlFharOShTjoBxU_tyzPB5-HJUZ0XdZTWQfg2JMc,3951
 moat/kv/mock/__init__.py,sha256=XWqHDWWWbXL61GgIFxxz0ciu2nW2Ba1uKm1J5ZTUuBw,2595
 moat/kv/mock/mqtt.py,sha256=b9pzbwQBmTX2eSiSgNO7nh2-7l8-0TT8n2GxinQ-1l0,5213
 moat/kv/mock/tracer.py,sha256=qLEIn9gdlYUypyRYD8O8SbM8ye8XR4xtBl3otP6uNLs,2058
 moat/kv/obj/__init__.py,sha256=OaQ7PsvvhRhd_H7KUM15nGeApckkCyOv7Xf4llqkzi0,19792
 moat/kv/obj/command.py,sha256=PzMQOEsXRKjKU3WvFtq1QaPJYBk6oWScKIrA-hAD5vg,7426
-moat_kv-0.71.6.dist-info/licenses/LICENSE,sha256=ZSyHhIjRRWNh4Iw_hgf9e6WYkqFBA9Fczk_5PIW1zIs,185
-moat_kv-0.71.6.dist-info/licenses/LICENSE.APACHE2,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-moat_kv-0.71.6.dist-info/licenses/LICENSE.MIT,sha256=Pm2uVV65J4f8gtHUg1Vnf0VMf2Wus40_nnK_mj2vA0s,1046
-moat_kv-0.71.6.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_kv-0.71.6.dist-info/METADATA,sha256=OzfZkMKKGMmZtkvfnziwUBR6bbN9VJo7cdmVhXcDMxQ,3376
-moat_kv-0.71.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-moat_kv-0.71.6.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_kv-0.71.6.dist-info/RECORD,,
+moat_kv-0.71.7.dist-info/licenses/LICENSE,sha256=ZSyHhIjRRWNh4Iw_hgf9e6WYkqFBA9Fczk_5PIW1zIs,185
+moat_kv-0.71.7.dist-info/licenses/LICENSE.APACHE2,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+moat_kv-0.71.7.dist-info/licenses/LICENSE.MIT,sha256=Pm2uVV65J4f8gtHUg1Vnf0VMf2Wus40_nnK_mj2vA0s,1046
+moat_kv-0.71.7.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_kv-0.71.7.dist-info/METADATA,sha256=lNjt0HBXSSzRYA2HR_Ibl3_Nfk5FmxkueQzChvs8u_k,3376
+moat_kv-0.71.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_kv-0.71.7.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_kv-0.71.7.dist-info/RECORD,,