moat-kv 0.71.12__tar.gz → 0.71.14__tar.gz

{moat_kv-0.71.12 → moat_kv-0.71.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv
-Version: 0.71.12
+Version: 0.71.14
 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.12 → moat_kv-0.71.14}/debian/changelog

@@ -1,3 +1,15 @@
+moat-kv (0.71.14-1) unstable; urgency=medium
+
+  * New release for 25.3.3
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 11:50:00 +0200
+
+moat-kv (0.71.13-1) unstable; urgency=medium
+
+  * New release for 25.3.3
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 09:29:57 +0200
+
 moat-kv (0.71.12-1) unstable; urgency=medium
 
   * New release for 25.3.3

{moat_kv-0.71.12 → moat_kv-0.71.14}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
 	"moat-util ~= 0.56.4",
 	"exceptiongroup; python_version<'3.11'",
 ]
-version = "0.71.12"
+version = "0.71.14"
 keywords = [ "MoaT",]
 requires-python = ">=3.8"
 name = "moat-kv"

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/command/acl.py

@@ -46,7 +46,7 @@ async def list_(obj):
 async def dump(obj, name, path, as_dict):
     """Dump a complete (or partial) ACL."""
     path = P(path)
-    await data_get(obj, Path("acl", name, path), internal=True, as_dict=as_dict)
+    await data_get(obj.client, Path("acl", name, path), internal=True, as_dict=as_dict, out=obj.stdout)
 
 
 @cli.command()

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/command/data.py

@@ -20,7 +20,7 @@ async def cli(ctx, path):
     This subcommand accesses the actual user data stored in your MoaT-KV tree.
     """
     if ctx.invoked_subcommand is None:
-        await data_get(ctx.obj, path, recursive=False)
+        await data_get(ctx.obj.client, path, recursive=False, out=ctx.obj.stdout)
     else:
         ctx.obj.path = path
 
@@ -61,7 +61,7 @@ async def get(obj, **k):
     for incremental output.
     """
 
-    await data_get(obj, obj.path, **k)
+    await data_get(obj.client, obj.path, out=obj.stdout, **k)
 
 
 @cli.command("list")
@@ -101,7 +101,7 @@ async def list_(obj, **k):
     k["recursive"] = True
     k["raw"] = True
     k["empty"] = True
-    await data_get(obj, obj.path, **k)
+    await data_get(obj.client, obj.path, out=obj.stdout, **k)
 
 
 @cli.command("set", short_help="Add or update an entry")

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/command/job.py

@@ -237,10 +237,11 @@ async def list_(obj, state, state_only, table, as_dict):
 
     else:
         await data_get(
-            obj,
+            obj.client,
             obj.path + path,
             as_dict=as_dict,
             item_mangle=partial(_state_fix, obj, state, state_only, None if as_dict else path),
+            out=obj.stdout,
         )
 
 

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/data.py

@@ -45,9 +45,10 @@ def add_dates(d):
 
 
 async def data_get(
-    obj,
+    conn,
     path,
     *,
+    meta=False,
     recursive=True,
     as_dict="_",
     maxdepth=-1,
@@ -58,6 +59,7 @@ async def data_get(
     path_mangle=None,
     item_mangle=None,
     add_date=False,
+    out=None,
 ):
     """Generic code to dump a subtree.
 
@@ -75,6 +77,11 @@ async def data_get(
         async def item_mangle(x):  # pylint: disable=function-redefined
             return x
 
+    if out is None:
+        out = sys.stdout
+    elif out is False:
+        out = []
+
     if recursive:
         kw = {}
         if maxdepth is not None and maxdepth >= 0:
@@ -83,13 +90,13 @@ async def data_get(
             kw["min_depth"] = mindepth
         if empty:
             kw["empty"] = True
-        if obj.meta:
-            kw.setdefault("nchain", obj.meta)
+        if meta:
+            kw.setdefault("nchain", meta)
         y = {}
         if internal:
-            res = await obj.client._request(action="get_tree_internal", path=path, iter=True, **kw)
+            res = await conn._request(action="get_tree_internal", path=path, iter=True, **kw)
         else:
-            res = obj.client.get_tree(path, **kw)
+            res = conn.get_tree(path, **kw)
         async for r in res:
             r = await item_mangle(r)
             if r is None:
@@ -107,7 +114,7 @@ async def data_get(
                 for p in path:
                     yy = yy.setdefault(p, {})
                 try:
-                    yy[as_dict] = r if obj.meta else r.value
+                    yy[as_dict] = r if meta else r.value
                 except AttributeError:
                     if empty:
                         yy[as_dict] = None
@@ -117,13 +124,17 @@ async def data_get(
                 else:
                     y = {}
                     try:
-                        y[path] = r if obj.meta else r.value
+                        y[path] = r if meta else r.value
                     except AttributeError:
                         if empty:
                             y[path] = None
                         else:
                             continue
-                yprint([y], stream=obj.stdout)
+
+                if isinstance(out,list):
+                    out.append(y)
+                else:
+                    yprint([y], stream=out)
 
         if as_dict is not None:
             if maxdepth:
@@ -140,24 +151,30 @@ async def data_get(
                     return d
 
                 y = simplex(y)
-            yprint(y, stream=obj.stdout)
+            if isinstance(out,list):
+                return y
+            yprint(y, stream=out)
         return  # end "if recursive"
 
-    res = await obj.client.get(path, nchain=obj.meta)
-    if not obj.meta:
+    res = await conn.get(path, nchain=meta)
+    if add_date and "value" in res:
+        add_dates(res.value)
+    if not meta:
         try:
             res = res.value
         except AttributeError:
-            if obj.debug:
-                print("No data at", path, file=sys.stderr)
+#           if obj.debug:
+#               print("No data at", path, file=sys.stderr)
             return
 
+    if out is False:
+        return d
     if not raw:
-        yprint(res, stream=obj.stdout)
+        yprint(res, stream=out)
     elif isinstance(res, bytes):
-        os.write(obj.stdout.fileno(), res)
+        os.write(out.fileno(), res)
     else:
-        obj.stdout.write(str(res))
+        out.write(str(res))
     pass  # end get
 
 

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/mock/mqtt.py

@@ -42,7 +42,6 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
     TESTCFG.server.port = None
     TESTCFG.root = "test"
     if C_OUT is not NotGiven:
-        CFG["_stdout"] = C_OUT
         TESTCFG["_stdout"] = C_OUT
 
     if ssl:

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/model.py

@@ -503,6 +503,18 @@ class NodeEvent:
             res.prev = self.prev.serialize(nchain - 1)
         return res
 
+    def serialize_link(self, nchain=-1) -> dict:
+        "Serialization for gatewaying to moat-link"
+        if not nchain:
+            raise RuntimeError("A chopped-off NodeEvent must not be sent")
+        res = []
+        s = self
+        while s is not None and nchain != 0:
+            res.extend((self.node.name, self.tick))
+            s = s.prev
+            nchain -= 1
+        return res
+
     @classmethod
     def deserialize(cls, msg, cache):
         if msg is None:
@@ -518,6 +530,16 @@ class NodeEvent:
             self.prev = cls.deserialize(msg["prev"], cache=cache)
         return self
 
+    @classmethod
+    def deserialize_link(cls, msg, cache):
+        "Deserialization for gatewaying to moat-link"
+        if not msg:
+            return None
+        node,tick,*msg = msg
+        self = cls(node=Node(node, tick=tick, cache=cache), tick=tick)
+        self.prev = cls.deserialize_link(msg, cache=cache)
+        return self
+
     def attach(self, prev: NodeEvent = None, server=None):
         """Copy this node, if necessary, and attach a filtered `prev` chain to it"""
         if prev is not None:
@@ -702,10 +724,6 @@ class Entry:
 
         first = True
         for name in path:
-            if name is None and not nulls_ok:
-                raise ValueError("Null path element")
-            if nulls_ok == 1:  # root only
-                nulls_ok = False
             child = self._sub.get(name, None) if self is not None else None
             if child is None:
                 if create is False:
@@ -738,10 +756,6 @@ class Entry:
         # KEEP IN SYNC with `follow_acl`, above!
 
         for name in path:
-            if name is None and not nulls_ok:
-                raise ValueError("Null path element")
-            if nulls_ok == 1:  # root only
-                nulls_ok = False
             child = self._sub.get(name, None) if self is not None else None
             if child is None:
                 if create is False:

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat/kv/server.py

@@ -650,6 +650,11 @@ class SCmd_msg_monitor(StreamCommand):
                     try:
                         res["data"] = codec.decode(resp.payload)
                     except Exception as exc:
+                        self.client.server.logger.exception(
+                                "ERR %d: Client error on %s",
+                                self.client._client_nr,
+                                repr(exc),
+                            )
                         res["raw"] = resp.payload
                         res["error"] = repr(exc)
 
@@ -1246,8 +1251,8 @@ class ServerClient:
                         msg = {"error": str(exc)}
                         if isinstance(exc, ClientError):  # pylint doesn't seem to see this, so …:
                             msg["etype"] = exc.etype  # pylint: disable=no-member  ### YES IT HAS
-                        else:
-                            self.logger.exception(
+                        #else:
+                        self.logger.exception(
                                 "ERR %d: Client error on %s",
                                 self._client_nr,
                                 repr(msg),

{moat_kv-0.71.12 → moat_kv-0.71.14}/src/moat_kv.egg-info/PKG-INFO

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