moat-kv 0.70.22__py3-none-any.whl → 0.70.24__py3-none-any.whl

moat/kv/command/acl.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import sys
 
@@ -22,7 +23,11 @@ async def cli():
 async def list_(obj):
     """List ACLs."""
     res = await obj.client._request(
-        action="enum_internal", path=("acl",), iter=False, nchain=obj.meta, empty=True
+        action="enum_internal",
+        path=("acl",),
+        iter=False,
+        nchain=obj.meta,
+        empty=True,
     )
     yprint(res if obj.meta else res.result, stream=obj.stdout)
 
@@ -57,7 +62,10 @@ async def get(obj, name, path):
     if not len(path):
         raise click.UsageError("You need a non-empty path.")
     res = await obj.client._request(
-        action="get_internal", path=("acl", name) + path, iter=False, nchain=obj.meta
+        action="get_internal",
+        path=("acl", name) + path,
+        iter=False,
+        nchain=obj.meta,
     )
 
     if not obj.meta:
@@ -94,9 +102,7 @@ async def set_(obj, acl, name, path):
     acl = set(acl)
 
     if acl - ACL:
-        raise click.UsageError(
-            f"You're trying to set an unknown ACL flag: {acl - ACL !r}"
-        )
+        raise click.UsageError(f"You're trying to set an unknown ACL flag: {acl - ACL!r}")
 
     res = await obj.client._request(
         action="get_internal",
@@ -106,7 +112,7 @@ async def set_(obj, acl, name, path):
     )
     ov = set(res.get("value", ""))
     if ov - ACL:
-        print(f"Warning: original ACL contains unknown: {ov - acl !r}", file=sys.stderr)
+        print(f"Warning: original ACL contains unknown: {ov - acl!r}", file=sys.stderr)
 
     if mode == "-" and not acl:
         res = await obj.client._request(

moat/kv/command/auth.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import asyncclick as click
 from moat.util import NotGiven, Path, split_arg, yprint
@@ -41,7 +42,6 @@ async def enum_auth(obj):
     for r in res.result:
         print(r)
         yield r
-    pass
 
 
 async def one_auth(obj):
@@ -73,7 +73,10 @@ async def enum_typ(obj, kind="user", ident=None, nchain=0):
             yield res
         else:
             async with obj.client._stream(
-                action="auth_list", typ=auth, kind=kind, nchain=nchain
+                action="auth_list",
+                typ=auth,
+                kind=kind,
+                nchain=nchain,
             ) as res:
                 async for r in res:
                     yield r

moat/kv/command/code.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import sys
 
@@ -32,18 +33,14 @@ async def cli(ctx, path):
 
 
 @cli.command()
-@click.option(
-    "-s", "--script", type=click.File(mode="w", lazy=True), help="Save the code here"
-)
+@click.option("-s", "--script", type=click.File(mode="w", lazy=True), help="Save the code here")
 @click.pass_obj
 async def get(obj, script):
     """Read a code entry"""
     if not len(obj.codepath):
         raise click.UsageError("You need a non-empty path.")
 
-    res = await obj.client._request(
-        action="get_value", path=obj.path, iter=False, nchain=obj.meta
-    )
+    res = await obj.client._request(action="get_value", path=obj.path, iter=False, nchain=obj.meta)
     if "value" not in res:
         if obj.debug:
             print("No entry here.", file=sys.stderr)
@@ -66,17 +63,13 @@ async def get(obj, script):
     help="The code is async / sync (default: async)",
     default=True,
 )
-@click.option(
-    "-t", "--thread", is_flag=True, help="The code should run in a worker thread"
-)
+@click.option("-t", "--thread", is_flag=True, help="The code should run in a worker thread")
 @click.option("-s", "--script", type=click.File(mode="r"), help="File with the code")
 @click.option("-i", "--info", type=str, help="one-liner info about the code")
-@click.option(
-    "-d", "--data", type=click.File(mode="r"), help="load the metadata (YAML)"
-)
+@click.option("-d", "--data", type=click.File(mode="r"), help="load the metadata (YAML)")
 @attr_args
 @click.pass_obj
-async def set_(obj, thread, script, data, vars_, eval_, path_, async_, info):
+async def set_(obj, thread, script, data, async_, info, **kw):
     """Save Python code.
 
     The code may have inputs. You specify the inputs and their default
@@ -119,7 +112,7 @@ async def set_(obj, thread, script, data, vars_, eval_, path_, async_, info):
         vs = set()
     vd = msg.setdefault("default", {})
 
-    vd = process_args(vd, vars_, eval_, path_, vs=vs)
+    vd = process_args(vd, vs=vs, **kw)
     msg["vars"] = list(vs)
     msg["default"] = vd
 
@@ -141,9 +134,7 @@ async def mod():
 
 
 @mod.command("get")
-@click.option(
-    "-s", "--script", type=click.File(mode="w", lazy=True), help="Save the code here"
-)
+@click.option("-s", "--script", type=click.File(mode="w", lazy=True), help="Save the code here")
 @click.argument("path", nargs=1)
 @click.pass_obj  # pylint: disable=function-redefined
 async def get_mod(obj, path, script):
@@ -172,12 +163,8 @@ async def get_mod(obj, path, script):
 
 
 @mod.command("set")
-@click.option(
-    "-s", "--script", type=click.File(mode="r"), help="File with the module's code"
-)
-@click.option(
-    "-d", "--data", type=click.File(mode="r"), help="load the metadata (YAML)"
-)
+@click.option("-s", "--script", type=click.File(mode="r"), help="File with the module's code")
+@click.option("-d", "--data", type=click.File(mode="r"), help="load the metadata (YAML)")
 @click.argument("path", nargs=1)  # pylint: disable=function-redefined
 @click.pass_obj
 async def set_mod(obj, path, script, data):

moat/kv/command/codec.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import asyncclick as click
 from moat.util import NotGiven, P, Path, PathLongener, yload, yprint
@@ -11,15 +12,9 @@ async def cli():
 
 
 @cli.command()
-@click.option(
-    "-e", "--encode", type=click.File(mode="w", lazy=True), help="Save the encoder here"
-)
-@click.option(
-    "-d", "--decode", type=click.File(mode="w", lazy=True), help="Save the decoder here"
-)
-@click.option(
-    "-s", "--script", type=click.File(mode="w", lazy=True), help="Save the data here"
-)
+@click.option("-e", "--encode", type=click.File(mode="w", lazy=True), help="Save the encoder here")
+@click.option("-d", "--decode", type=click.File(mode="w", lazy=True), help="Save the decoder here")
+@click.option("-s", "--script", type=click.File(mode="w", lazy=True), help="Save the data here")
 @click.argument("path", nargs=1)
 @click.pass_obj
 async def get(obj, path, script, encode, decode):
@@ -28,7 +23,10 @@ async def get(obj, path, script, encode, decode):
     if not len(path):
         raise click.UsageError("You need a non-empty path.")
     res = await obj.client._request(
-        action="get_internal", path=Path("codec") + path, iter=False, nchain=obj.meta
+        action="get_internal",
+        path=Path("codec") + path,
+        iter=False,
+        nchain=obj.meta,
     )
     if encode and res.get("encode", None) is not None:
         encode.write(res.pop("encode"))
@@ -166,13 +164,11 @@ async def convert(obj, path, codec, name, delete, list_):
                 try:
                     print(f"{r.path} : {Path.build(r.value['codec'])}", file=obj.stdout)
                 except Exception as e:
-                    print(f"{Path(r.path)} {e !r}", file=obj.stdout)
+                    print(f"{Path(r.path)} {e!r}", file=obj.stdout)
 
         return
     if delete:
-        res = await obj.client._request(
-            action="delete_internal", path=Path("conv", name) + path
-        )
+        res = await obj.client._request(action="delete_internal", path=Path("conv", name) + path)
     else:
         msg = {"codec": codec}
         res = await obj.client._request(

moat/kv/command/data.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import datetime
 import time
@@ -47,9 +48,7 @@ async def cli(ctx, path):
 )
 @click.option("-r", "--recursive", is_flag=True, help="Read a complete subtree")
 @click.option("-e", "--empty", is_flag=True, help="Include empty nodes")
-@click.option(
-    "-R", "--raw", is_flag=True, help="Print string values without quotes etc."
-)
+@click.option("-R", "--raw", is_flag=True, help="Print string values without quotes etc.")
 @click.option("-D", "--add-date", is_flag=True, help="Add *_date entries")
 @click.pass_obj
 async def get(obj, **k):
@@ -109,7 +108,7 @@ async def list_(obj, **k):
 @click.option("-l", "--last", nargs=2, help="Previous change entry (node serial)")
 @click.option("-n", "--new", is_flag=True, help="This is a new entry.")
 @click.pass_obj
-async def set_(obj, vars_, eval_, path_, last, new):
+async def set_(obj, last, new, **kw):
     """
     Store a value at some MoaT-KV position.
 
@@ -123,16 +122,15 @@ async def set_(obj, vars_, eval_, path_, last, new):
     MoaT-KV entries typically are mappings. Use a colon as the path if you
     want to replace the top level.
     """
-    args = {}
     if new:
         if last:
             raise click.UsageError("'new' and 'last' are mutually exclusive")
-        args["chain"] = None
+        kw["chain"] = None
     else:
         if last:
-            args["chain"] = {"node": last[0], "tick": int(last[1])}
+            kw["chain"] = {"node": last[0], "tick": int(last[1])}
 
-    res = await node_attr(obj, obj.path, vars_, eval_, path_, **args)
+    res = await node_attr(obj, obj.path, **kw)
 
     if obj.meta:
         yprint(res, stream=obj.stdout)
@@ -156,9 +154,7 @@ class nstr:
 @click.option("-l", "--last", nargs=2, help="Previous change entry (node serial)")
 @click.option("-r", "--recursive", is_flag=True, help="Delete a complete subtree")
 @click.option("--internal", is_flag=True, help="Affect the internal tree. DANGER.")
-@click.option(
-    "-e", "--eval", "eval_", is_flag=True, help="The previous value shall be evaluated."
-)
+@click.option("-e", "--eval", "eval_", is_flag=True, help="The previous value shall be evaluated.")
 @click.pass_obj
 async def delete(obj, prev, last, recursive, eval_, internal):
     """
@@ -178,9 +174,7 @@ async def delete(obj, prev, last, recursive, eval_, internal):
         raise click.UsageError("You need to add a value that can be evaluated")
     if recursive:
         if prev is not NotGiven or last:
-            raise click.UsageError(
-                "You can't use a prev value when deleting recursively."
-            )
+            raise click.UsageError("You can't use a prev value when deleting recursively.")
         if internal:
             raise click.UsageError("'internal' and 'recursive' are mutually exclusive")
     else:
@@ -191,9 +185,7 @@ async def delete(obj, prev, last, recursive, eval_, internal):
         if last:
             args["chain"] = {"node": last[0], "tick": int(last[1])}
 
-    res = await obj.client.delete(
-        path=obj.path, nchain=obj.meta, recursive=recursive, **args
-    )
+    res = await obj.client.delete(path=obj.path, nchain=obj.meta, recursive=recursive, **args)
     if isinstance(res, StreamedRequest):
         pl = PathLongener(obj.path)
         async for r in res:
@@ -221,7 +213,8 @@ async def monitor(obj, state, only, path_only, add_date, ignore):
     async with obj.client.watch(
         obj.path,
         nchain=obj.meta,
-        fetch=state, max_depth=0 if only else -1, 
+        fetch=state,
+        max_depth=0 if only else -1,
         long_path=False,
     ) as res:
         pl = PathLongener(() if path_only else obj.path)
@@ -252,9 +245,7 @@ async def monitor(obj, state, only, path_only, add_date, ignore):
                         continue
             if flushing:
                 r["time"] = time.time()
-                r["_time"] = datetime.datetime.now().isoformat(
-                    sep=" ", timespec="milliseconds"
-                )
+                r["_time"] = datetime.datetime.now().isoformat(sep=" ", timespec="milliseconds")
             yprint(r, stream=obj.stdout)
             print("---", file=obj.stdout)
             if flushing:

moat/kv/command/dump/__init__.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import datetime
 import sys
@@ -49,7 +50,7 @@ async def init(node, file):
                 path=[],
                 tock=1,
                 value="Initial data",
-            )
+            ),
         )
 
 
@@ -109,7 +110,8 @@ async def msg_(obj, path):
                     v["_type"] = type(msg).__name__
 
                 v["_timestamp"] = datetime.datetime.now().isoformat(
-                    sep=" ", timespec="milliseconds"
+                    sep=" ",
+                    timespec="milliseconds",
                 )
 
                 yprint(v, stream=obj.stdout)

moat/kv/command/error.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import sys
 
@@ -37,17 +38,11 @@ async def resolve(obj, path, subsys):
 
 @cli.command()
 @click.option("-n", "--node", help="add details from this node")
-@click.option(
-    "-s", "--subsystem", "subsys", help="only show errors from this subsystem"
-)
+@click.option("-s", "--subsystem", "subsys", help="only show errors from this subsystem")
 @click.option("-r", "--resolved", is_flag=True, help="only resolved errors")
-@click.option(
-    "-v", "--verbose", count=True, help="add per-node details (-vv for traces)"
-)
+@click.option("-v", "--verbose", count=True, help="add per-node details (-vv for traces)")
 @click.option("-a", "--all-errors", is_flag=True, help="add details from all nodes")
-@click.option(
-    "-d", "--as-dict", default=None, help="Dump a list of all open (or resolved) error."
-)
+@click.option("-d", "--as-dict", default=None, help="Dump a list of all open (or resolved) error.")
 @click.option("-p", "--path", default=":", help="only show errors below this subpath")
 @click.pass_obj
 async def dump(obj, as_dict, path, node, all_errors, verbose, resolved, subsys):
@@ -146,9 +141,7 @@ async def dump(obj, as_dict, path, node, all_errors, verbose, resolved, subsys):
         path = ()
 
     if res is None:
-        res = obj.client.get_tree(
-            path_, min_depth=d, max_depth=d, nchain=3 if obj.meta else 0
-        )
+        res = obj.client.get_tree(path_, min_depth=d, max_depth=d, nchain=3 if obj.meta else 0)
     async for r in res:
         await one(r)
 

moat/kv/command/internal.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 from collections.abc import Mapping
 
@@ -30,9 +31,7 @@ async def cli():
 @click.option("-s", "--superseded", is_flag=True, help="Get superseded-data status.")
 @click.option("-D", "--debug", is_flag=True, help="Get internal verbosity.")
 @click.option("--debugger", is_flag=True, help="Start a remote debugger. DO NOT USE.")
-@click.option(
-    "-k", "--known", hidden=True, is_flag=True, help="Get superseded-data status."
-)
+@click.option("-k", "--known", hidden=True, is_flag=True, help="Get superseded-data status.")
 @click.option("-a", "--all", is_flag=True, help="All available data.")
 @click.pass_obj
 async def state(obj, **flags):
@@ -56,9 +55,7 @@ async def state(obj, **flags):
 
 
 @cli.command()
-@click.option(
-    "-d", "--deleted", is_flag=True, help="Mark as deleted. Default: superseded"
-)
+@click.option("-d", "--deleted", is_flag=True, help="Mark as deleted. Default: superseded")
 @click.option(
     "-n",
     "--node",
@@ -170,9 +167,7 @@ async def dump(obj, path):
     path = P(path)
     y = {}
     pl = PathLongener()
-    async for r in await obj.client._request(
-        "get_tree_internal", path=path, iter=True, nchain=0
-    ):
+    async for r in await obj.client._request("get_tree_internal", path=path, iter=True, nchain=0):
         pl(r)
         path = r["path"]
         yy = y
@@ -227,17 +222,13 @@ async def enum(obj, node, num, current, copy):
     else:
         for k in res.result:
             if copy or obj.debug > 1:
-                res = await obj.client._request(
-                    "get_value", node=node, tick=k, nchain=3
-                )
+                res = await obj.client._request("get_value", node=node, tick=k, nchain=3)
                 if obj.debug > 1:
                     print(k, res.path)
                 else:
                     print(k)
                 if copy and res.chain.node == node:
-                    res = await obj.client.set(
-                        res.path, value=res.value, chain=res.chain
-                    )
+                    res = await obj.client.set(res.path, value=res.value, chain=res.chain)
             else:
                 print(k)
 

moat/kv/command/job.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import sys
 import time
@@ -14,9 +15,7 @@ from moat.kv.runner import AllRunnerRoot, AnyRunnerRoot, SingleRunnerRoot
 
 
 @click.group()  # pylint: disable=undefined-variable
-@click.option(
-    "-n", "--node", help="node to run this code on. Empty: any one node, '-': all nodes"
-)
+@click.option("-n", "--node", help="node to run this code on. Empty: any one node, '-': all nodes")
 @click.option("-g", "--group", help="group to run this code on. Empty: default")
 @click.pass_context
 async def cli(ctx, node, group):
@@ -56,9 +55,7 @@ async def cli(ctx, node, group):
     obj.statepath = cfg["state"] + obj.subpath
 
 
-@cli.group(
-    "at", short_help="path of the job to operate on", invoke_without_command=True
-)
+@cli.group("at", short_help="path of the job to operate on", invoke_without_command=True)
 @click.argument("path", nargs=1, type=P)
 @click.pass_context
 async def at_cli(ctx, path):
@@ -70,7 +67,10 @@ async def at_cli(ctx, path):
 
     if ctx.invoked_subcommand is None:
         res = await obj.client.get(obj.path + path, nchain=obj.meta)
-        yprint(res if obj.meta else res.value if 'value' in res else None, stream=obj.stdout)
+        yprint(
+            res if obj.meta else res.value if "value" in res else None,
+            stream=obj.stdout,
+        )
 
 
 @cli.command("info")
@@ -141,7 +141,10 @@ async def run(obj, nodes):
         c = obj.client
         cr = await CodeRoot.as_handler(c)
         await obj.runner_root.as_handler(
-            c, subpath=obj.subpath, code=cr, **({"nodes": nodes} if nodes else {})
+            c,
+            subpath=obj.subpath,
+            code=cr,
+            **({"nodes": nodes} if nodes else {}),
         )
         evt.set()
         await anyio.sleep_forever()
@@ -154,7 +157,10 @@ async def _state_fix(obj, state, state_only, path, r):
         return
     if state:
         rs = await obj.client._request(
-            action="get_value", path=state + r.path, iter=False, nchain=obj.meta
+            action="get_value",
+            path=state + r.path,
+            iter=False,
+            nchain=obj.meta,
         )
         if state_only:
             r.value = rs
@@ -235,9 +241,7 @@ async def list_(obj, state, state_only, table, as_dict):
             obj,
             obj.path + path,
             as_dict=as_dict,
-            item_mangle=partial(
-                _state_fix, obj, state, state_only, None if as_dict else path
-            ),
+            item_mangle=partial(_state_fix, obj, state, state_only, None if as_dict else path),
         )
 
 
@@ -280,7 +284,10 @@ async def get(obj, state):
         raise click.UsageError("You need a non-empty path.")
 
     res = await obj.client._request(
-        action="get_value", path=obj.path + path, iter=False, nchain=obj.meta
+        action="get_value",
+        path=obj.path + path,
+        iter=False,
+        nchain=obj.meta,
     )
     if "value" not in res:
         print("Not found.", file=sys.stderr)
@@ -316,18 +323,12 @@ async def delete(obj, force):
             val.target = None
         if val.target is not None:
             val.target = None
-            res = await obj.client.set(
-                obj.path + path, value=val, nchain=3, chain=res.chain
-            )
+            res = await obj.client.set(obj.path + path, value=val, nchain=3, chain=res.chain)
             if not force:
                 res.info = "'target' was set: cleared but not deleted."
         if force or val.target is None:
             sres = await obj.client.get(obj.statepath + path, nchain=3)
-            if (
-                not force
-                and "value" in sres
-                and sres.value.stopped < sres.value.started
-            ):
+            if not force and "value" in sres and sres.value.stopped < sres.value.started:
                 res.info = "Still running, not deleted."
             else:
                 sres = await obj.client.delete(obj.statepath + path, chain=sres.chain)
@@ -350,15 +351,11 @@ async def delete(obj, force):
 @click.option("-r", "--repeat", type=int, help="Seconds the code should re-run after")
 @click.option("-k", "--ok", type=float, help="Code is OK if it ran this many seconds")
 @click.option("-b", "--backoff", type=float, help="Back-off factor. Default: 1.4")
-@click.option(
-    "-d", "--delay", type=int, help="Seconds the code should retry after (w/ backoff)"
-)
+@click.option("-d", "--delay", type=int, help="Seconds the code should retry after (w/ backoff)")
 @click.option("-i", "--info", help="Short human-readable information")
 @attr_args
 @click.pass_obj
-async def set_(
-    obj, code, tm, info, ok, repeat, delay, backoff, copy, vars_, eval_, path_
-):
+async def set_(obj, code, tm, info, ok, repeat, delay, backoff, copy, **kw):
     """Add or modify a runner.
 
     Code typically requires some input parameters.
@@ -377,9 +374,7 @@ async def set_(
         copy = P(copy)
     path = obj.path + P(path)
 
-    res = await obj.client._request(
-        action="get_value", path=copy or path, iter=False, nchain=3
-    )
+    res = await obj.client._request(action="get_value", path=copy or path, iter=False, nchain=3)
     if "value" not in res:
         if copy:
             raise click.UsageError("--copy: use the complete path to an existing entry")
@@ -394,7 +389,7 @@ async def set_(
             raise click.UsageError("'--copy' needs a runner entry")
 
     vl = attrdict(**res.setdefault("data", {}))
-    vl = process_args(vl, vars_, eval_, path_)
+    vl = process_args(vl, **kw)
     res["data"] = vl
 
     if code is not None:

moat/kv/command/log.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import asyncclick as click
 from moat.util import yprint

moat/kv/command/server.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import asyncclick as click
 
@@ -99,9 +100,7 @@ async def cli(obj, name, load, save, init, incremental, eval_, auth, force, node
     from moat.util import as_service
 
     if load and nodes:
-        raise click.UsageError(
-            "Either read from a file or fetch from a node. Not both."
-        )
+        raise click.UsageError("Either read from a file or fetch from a node. Not both.")
     if auth and force:
         raise click.UsageError("Using both '-a' and '-f' is redundant. Choose one.")