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

moat/kv/command/type.py

@@ -1,4 +1,5 @@
 # command line interface
+from __future__ import annotations
 
 import json
 
@@ -13,15 +14,9 @@ async def cli():
 
 
 @cli.command()
-@click.option(
-    "-s", "--script", type=click.File(mode="w", lazy=True), help="Save the script here"
-)
-@click.option(
-    "-S", "--schema", type=click.File(mode="w", lazy=True), help="Save the schema here"
-)
-@click.option(
-    "-y", "--yaml", "yaml_", is_flag=True, help="Write schema as YAML. Default: JSON."
-)
+@click.option("-s", "--script", type=click.File(mode="w", lazy=True), help="Save the script here")
+@click.option("-S", "--schema", type=click.File(mode="w", lazy=True), help="Save the schema here")
+@click.option("-y", "--yaml", "yaml_", is_flag=True, help="Write schema as YAML. Default: JSON.")
 @click.argument("path", type=P, nargs=1)
 @click.pass_obj
 async def get(obj, path, script, schema, yaml_):
@@ -29,7 +24,10 @@ async def get(obj, path, script, schema, yaml_):
     if not len(path):
         raise click.UsageError("You need a non-empty path.")
     res = await obj.client._request(
-        action="get_internal", path=Path("type") + path, iter=False, nchain=obj.meta
+        action="get_internal",
+        path=Path("type") + path,
+        iter=False,
+        nchain=obj.meta,
     )
     try:
         r = res.value
@@ -51,18 +49,10 @@ async def get(obj, path, script, schema, yaml_):
 @cli.command("set")
 @click.option("-g", "--good", multiple=True, help="Example for passing values")
 @click.option("-b", "--bad", multiple=True, help="Example for failing values")
-@click.option(
-    "-d", "--data", type=click.File(mode="r"), help="Load metadata from this YAML file."
-)
-@click.option(
-    "-s", "--script", type=click.File(mode="r"), help="File with the checking script"
-)
-@click.option(
-    "-S", "--schema", type=click.File(mode="r"), help="File with the JSON schema"
-)
-@click.option(
-    "-y", "--yaml", "yaml_", is_flag=True, help="load the schema as YAML. Default: JSON"
-)
+@click.option("-d", "--data", type=click.File(mode="r"), help="Load metadata from this YAML file.")
+@click.option("-s", "--script", type=click.File(mode="r"), help="File with the checking script")
+@click.option("-S", "--schema", type=click.File(mode="r"), help="File with the JSON schema")
+@click.option("-y", "--yaml", "yaml_", is_flag=True, help="load the schema as YAML. Default: JSON")
 @click.argument("path", type=P, nargs=1)
 @click.pass_obj
 async def set_(obj, path, good, bad, script, schema, yaml_, data):
@@ -134,7 +124,10 @@ async def match(obj, path, type_, delete, raw):  # pylint: disable=redefined-bui
         y = {}
         pl = PathLongener()
         async for r in await obj.client._request(
-            "get_tree_internal", path=Path("match") + path, iter=True, nchain=0
+            "get_tree_internal",
+            path=Path("match") + path,
+            iter=True,
+            nchain=0,
         ):
             pl(r)
             path = r["path"]
@@ -154,9 +147,7 @@ async def match(obj, path, type_, delete, raw):  # pylint: disable=redefined-bui
         raise click.UsageError("You can only print the raw path when reading a match.")
 
     if delete:
-        res = await obj.client._request(
-            action="delete_internal", path=Path("type") + path
-        )
+        res = await obj.client._request(action="delete_internal", path=Path("type") + path)
         if obj.meta:
             yprint(res, stream=obj.stdout)
         return
@@ -170,7 +161,11 @@ async def match(obj, path, type_, delete, raw):  # pylint: disable=redefined-bui
     else:
         act = "get_internal"
     res = await obj.client._request(
-        action=act, value=msg, path=Path("match") + path, iter=False, nchain=obj.meta
+        action=act,
+        value=msg,
+        path=Path("match") + path,
+        iter=False,
+        nchain=obj.meta,
     )
     if obj.meta:
         yprint(res, stream=obj.stdout)
@@ -189,7 +184,10 @@ async def list(obj, path):  # pylint: disable=redefined-builtin
     y = {}
     pl = PathLongener()
     async for r in await obj.client._request(
-        "get_tree_internal", path=Path("type") + path, iter=True, nchain=0
+        "get_tree_internal",
+        path=Path("type") + path,
+        iter=True,
+        nchain=0,
     ):
         pl(r)
         path = r["path"]

moat/kv/config.py

@@ -3,6 +3,8 @@ An online-updated config store
 
 """
 
+from __future__ import annotations
+
 try:
     from contextlib import asynccontextmanager
 except ImportError:  # pragma: no cover

moat/kv/data.py

@@ -1,6 +1,8 @@
 """
 Data access
 """
+from __future__ import annotations
+
 import datetime
 import os
 import sys
@@ -35,7 +37,8 @@ def add_dates(d):
                 continue
             if start <= v <= stop:
                 d[f"_{k}"] = datetime.datetime.fromtimestamp(v).isoformat(
-                    sep=" ", timespec="milliseconds"
+                    sep=" ",
+                    timespec="milliseconds",
                 )
 
     _add(d)
@@ -81,9 +84,7 @@ async def data_get(
             kw.setdefault("nchain", obj.meta)
         y = {}
         if internal:
-            res = await obj.client._request(
-                action="get_tree_internal", path=path, iter=True, **kw
-            )
+            res = await obj.client._request(action="get_tree_internal", path=path, iter=True, **kw)
         else:
             res = obj.client.get_tree(path, **kw)
         async for r in res:
@@ -182,16 +183,16 @@ def res_update(res, attr: Path, value=None, **kw):  # pylint: disable=redefined-
     return val._update(attr, value=value, **kw)
 
 
-async def node_attr(obj, path, vars_, eval_, path_, res=None, chain=None):
+async def node_attr(obj, path, res=None, chain=None, **kw):
     """
     Sub-attr setter.
 
     Args:
         obj: command object
         path: address of the node to change
-        vars_, eval_, path_: the results of `attr_args`
         res: old node, if it has been read already
         chain: change chain of node, copied from res if clear
+        **kw: the results of `attr_args`
 
     Returns the result of setting the attribute.
     """
@@ -207,7 +208,7 @@ async def node_attr(obj, path, vars_, eval_, path_, res=None, chain=None):
     except AttributeError:
         chain = None
         val = NotGiven
-    val = process_args(val, vars_, eval_, path_)
+    val = process_args(val, **kw)
     if val is NotGiven:
         res = await obj.client.delete(path, nchain=obj.meta, chain=chain)
     else:

moat/kv/errors.py

@@ -79,6 +79,8 @@ of this record.
 
 """
 
+from __future__ import annotations
+
 import logging
 import traceback
 from collections import defaultdict
@@ -212,7 +214,7 @@ class ErrorEntry(AttrClientEntry):
                 try:
                     m = message.format(exc=exc, **data)
                 except Exception as exc:  # pylint: disable=unused-argument  # OH COME ON
-                    m = message + f" (FORMAT {exc !r})"
+                    m = message + f" (FORMAT {exc!r})"
             else:
                 m = message
             if m:
@@ -304,9 +306,7 @@ class ErrorEntry(AttrClientEntry):
         if value is NotGiven:
             if self.value is NotGiven:
                 return
-            keep = await self.root.get_error_record(
-                self.subsystem, self.path, create=False
-            )
+            keep = await self.root.get_error_record(self.subsystem, self.path, create=False)
             if keep is not None:
                 self._real_entry = keep.real_entry
                 await self.move_to_real()
@@ -449,7 +449,13 @@ class ErrorRoot(ClientRoot):
         raise RuntimeError(f"This cannot happen: {entry.node} {entry.tock}")
 
     async def record_working(  # pylint: disable=dangerous-default-value
-        self, subsystem, path, *, comment=None, data={}, force=False
+        self,
+        subsystem,
+        path,
+        *,
+        comment=None,
+        data={},
+        force=False,
     ):
         """This exception has been fixed.
 
@@ -522,7 +528,11 @@ class ErrorRoot(ClientRoot):
             return  # owch, but can't be helped
 
         r = await rec.real_entry.add_exc(
-            self.name, exc=exc, data=data, comment=comment, message=message
+            self.name,
+            exc=exc,
+            data=data,
+            comment=comment,
+            message=message,
         )
         return r
 
@@ -535,9 +545,7 @@ class ErrorRoot(ClientRoot):
             return
 
         try:
-            del (self._done if entry.resolved else self._active)[entry.subsystem][
-                entry.path
-            ]
+            del (self._done if entry.resolved else self._active)[entry.subsystem][entry.path]
         except KeyError:
             pass
 

moat/kv/exceptions.py

@@ -3,7 +3,7 @@ This module affords all MoaT-KV exceptions.
 """
 
 # pylint: disable=unnecessary-pass
-
+from __future__ import annotations
 
 error_types = {}
 
@@ -39,8 +39,6 @@ class ClientError(MoaTKVError):
 
     etype: str = None
 
-    pass
-
 
 @_typed
 class ClientChainError(ClientError):
@@ -48,8 +46,6 @@ class ClientChainError(ClientError):
 
     etype = "chain"
 
-    pass
-
 
 @_typed
 class ClientConnectionError(ClientError):
@@ -57,8 +53,6 @@ class ClientConnectionError(ClientError):
 
     etype = "conn"
 
-    pass
-
 
 class ServerClosedError(ServerError):
     """The server closed our connection."""

moat/kv/mock/__init__.py

@@ -1,4 +1,5 @@
 # from asyncclick.testing import CliRunner
+from __future__ import annotations
 import io
 import logging
 import shlex
@@ -10,9 +11,11 @@ import attr
 from asyncscope import main_scope, scope
 from moat.src.test import run  # pylint:disable=import-error,no-name-in-module
 from moat.util import (  # pylint:disable=no-name-in-module
+    CFG,
     OptCtx,
     attrdict,
     combine_dict,
+    ensure_cfg,
     list_ext,
     load_ext,
     wrap_main,
@@ -27,7 +30,7 @@ try:
 except ImportError:
     from async_generator import asynccontextmanager
 
-CFG = yload(Path(__file__).parent.parent / "_config.yaml", attr=True)
+ensure_cfg("moat.kv")
 
 
 @attr.s
@@ -70,7 +73,10 @@ class S:
 
                 async with scope.using_scope():
                     c = await scope.service(
-                        f"moat.kv.client.{i}.{self._seq}", scc, self.s[i], **cfg
+                        f"moat.kv.client.{i}.{self._seq}",
+                        scc,
+                        self.s[i],
+                        **cfg,
                     )
                     yield c
                 return
@@ -92,6 +98,4 @@ class S:
             if isinstance(args, str):
                 args = args.split(" ")
         async with scope.using_scope():
-            return await run(
-                "-VV", "kv", "-h", h, "-p", p, *args, do_stdout=do_stdout
-            )
+            return await run("-VV", "kv", "-h", h, "-p", p, *args, do_stdout=do_stdout)

moat/kv/mock/mqtt.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import copy
 import logging
 import os
@@ -6,7 +7,7 @@ from contextlib import AsyncExitStack, asynccontextmanager
 from functools import partial
 
 import anyio
-import mock
+from unittest import mock
 import trio
 from asyncscope import main_scope, scope
 from moat.mqtt.broker import create_broker
@@ -65,7 +66,7 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
         pass  # test doesn't have autojump_clock fixture
 
     async def mock_get_host_port(st, host):
-        i = int(host[host.rindex("_") + 1 :])  # noqa: E203
+        i = int(host[host.rindex("_") + 1 :])
         s = st.s[i]
         await s.is_serving
         for host, port, *_ in s.ports:
@@ -122,21 +123,17 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
                                 "backend": "mqtt",
                                 "mqtt": {"uri": URI},
                             },
-                        }
+                        },
                     },
                     {"cfg": TESTCFG},
                 )
                 args_def.pop("init", None)
                 s = Server(name, **args)
                 ex.enter_context(
-                    mock.patch.object(
-                        s, "_set_tock", new=partial(mock_set_tock, s, s._set_tock)
-                    )
+                    mock.patch.object(s, "_set_tock", new=partial(mock_set_tock, s, s._set_tock)),
                 )
                 ex.enter_context(
-                    mock.patch.object(
-                        s, "_get_host_port", new=partial(mock_get_host_port, st)
-                    )
+                    mock.patch.object(s, "_get_host_port", new=partial(mock_get_host_port, st)),
                 )
                 st.s.append(s)
 
@@ -147,9 +144,7 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
                     await scp.spawn_service(with_broker, st.s[i], ready_evt=evt)
                     evts.append(evt)
                 else:
-                    setattr(
-                        st, f"run_{i}", partial(scp.spawn_service, with_broker, st.s[i])
-                    )
+                    setattr(st, f"run_{i}", partial(scp.spawn_service, with_broker, st.s[i]))
 
             for e in evts:
                 await e.wait()

moat/kv/mock/serf.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import copy
 import logging
 import time
@@ -6,7 +7,7 @@ from functools import partial
 
 import anyio
 import attr
-import mock
+from unittest import mock
 import trio
 from asyncscope import main_scope, scope
 from asyncserf.stream import SerfEvent
@@ -69,7 +70,7 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
             self.splits.remove(s)
 
     async def mock_get_host_port(st, host):
-        i = int(host[host.rindex("_") + 1 :])  # noqa: E203
+        i = int(host[host.rindex("_") + 1 :])
         s = st.s[i]
         await s.is_serving
         for host, port, *_ in s.ports:
@@ -96,7 +97,7 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
             logging._startTime = tm()
 
             ex.enter_context(
-                mock.patch("asyncserf.serf_client", new=partial(mock_serf_client, st))
+                mock.patch("asyncserf.serf_client", new=partial(mock_serf_client, st)),
             )
 
             for i in range(n):
@@ -121,14 +122,10 @@ async def stdtest(n=1, run=True, ssl=False, tocks=20, **kw):
                 )
                 s = Server(name, **args)
                 ex.enter_context(
-                    mock.patch.object(
-                        s, "_set_tock", new=partial(mock_set_tock, s, s._set_tock)
-                    )
+                    mock.patch.object(s, "_set_tock", new=partial(mock_set_tock, s, s._set_tock)),
                 )
                 ex.enter_context(
-                    mock.patch.object(
-                        s, "_get_host_port", new=partial(mock_get_host_port, st)
-                    )
+                    mock.patch.object(s, "_get_host_port", new=partial(mock_get_host_port, st)),
                 )
                 st.s.append(s)
 

moat/kv/mock/tracer.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import traceback
 
 import trio
@@ -31,12 +32,9 @@ class Tracer(trio.abc.Instrument):
         if isinstance(exception, Exception):
             self.etasks.add(task)
             self._print_with_task("*** task excepted", task, exception)
-        pass
 
     def before_task_step(self, task):
-        if isinstance(task._next_send, Error) and isinstance(
-            task._next_send.error, Exception
-        ):
+        if isinstance(task._next_send, Error) and isinstance(task._next_send.error, Exception):
             self._print_with_task("*** step resume ERROR", task, task._next_send.error)
             self.etasks.add(task)
         elif moat.kill:  # pylint: disable=c-extension-no-member  # OH COME ON

moat/kv/model.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 import weakref
 from collections import defaultdict
 from logging import getLogger
-from typing import Any, List
+from typing import Any
 
 from moat.util import NotGiven, Path, attrdict, create_queue
 from range_set import RangeSet
@@ -39,9 +39,7 @@ class Node:
     tick: int = None
     _present: RangeSet = None  # I have these as valid data. Superset of ``._deleted``.
     _deleted: RangeSet = None  # I have these as no-longer-valid data
-    _reported: RangeSet = (
-        None  # somebody else reported these missing data for this node
-    )
+    _reported: RangeSet = None  # somebody else reported these missing data for this node
     _superseded: RangeSet = None  # I know these once existed, but no more.
     entries: dict = None
     tock: int = 0  # tock when node was last observed
@@ -371,7 +369,7 @@ class NodeEvent:
 
     """
 
-    def __init__(self, node: Node, tick: int = None, prev: "NodeEvent" = None):
+    def __init__(self, node: Node, tick: int = None, prev: NodeEvent = None):
         self.node = node
         if tick is None:
             tick = node.tick
@@ -524,13 +522,15 @@ class NodeEvent:
             self.prev = cls.deserialize(msg["prev"], cache=cache)
         return self
 
-    def attach(self, prev: "NodeEvent" = None, server=None):
+    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:
             prev = prev.filter(self.node, server=server)
         if self.prev is not None or prev is not None:
             self = NodeEvent(  # pylint: disable=self-cls-assignment
-                node=self.node, tick=self.tick, prev=prev
+                node=self.node,
+                tick=self.tick,
+                prev=prev,
             )
         return self
 
@@ -538,9 +538,7 @@ class NodeEvent:
 class UpdateEvent:
     """Represents an event which updates something."""
 
-    def __init__(
-        self, event: NodeEvent, entry: "Entry", new_value, old_value=NotGiven, tock=None
-    ):
+    def __init__(self, event: NodeEvent, entry: Entry, new_value, old_value=NotGiven, tock=None):
         self.event = event
         self.entry = entry
         self.new_value = new_value
@@ -611,10 +609,10 @@ class UpdateEvent:
 class Entry:
     """This class represents one key/value pair"""
 
-    _parent: "Entry" = None
+    _parent: Entry = None
     name: str = None
-    _path: List[str] = None
-    _root: "Entry" = None
+    _path: list[str] = None
+    _root: Entry = None
     chain: NodeEvent = None
     SUBTYPE = None
     SUBTYPES = {}
@@ -622,7 +620,7 @@ class Entry:
 
     monitors = None
 
-    def __init__(self, name: str, parent: "Entry", tock=None):
+    def __init__(self, name: str, parent: Entry, tock=None):
         self.name = name
         self._sub = {}
         self.monitors = set()
@@ -632,7 +630,7 @@ class Entry:
             parent._add_subnode(self)
             self._parent = weakref.ref(parent)
 
-    def _add_subnode(self, child: "Entry"):
+    def _add_subnode(self, child: Entry):
         self._sub[child.name] = child
 
     def __hash__(self):
@@ -904,9 +902,7 @@ class Entry:
                 if not loading:
                     logger.warning("*** inconsistency ***")
                     logger.warning("Node: %s", self.path)
-                    logger.warning(
-                        "Current: %s :%s: %r", self.chain, self.tock, self._data
-                    )
+                    logger.warning("Current: %s :%s: %r", self.chain, self.tock, self._data)
                     logger.warning("New: %s :%s: %r", evt.event, evt.tock, evt_val)
                 if evt.tock < self.tock:
                     if not loading:
@@ -934,9 +930,7 @@ class Entry:
             n.seen(t, self)
         await self.updated(evt)
 
-    async def walk(
-        self, proc, acl=None, max_depth=-1, min_depth=0, _depth=0, full=False
-    ):
+    async def walk(self, proc, acl=None, max_depth=-1, min_depth=0, _depth=0, full=False):
         """
         Call coroutine ``proc`` on this node and all its children).
 
@@ -960,9 +954,7 @@ class Entry:
             if k is None and not full:
                 continue
             a = acl.step(k) if acl is not None else None
-            await v.walk(
-                proc, acl=a, max_depth=max_depth, min_depth=min_depth, _depth=_depth
-            )
+            await v.walk(proc, acl=a, max_depth=max_depth, min_depth=min_depth, _depth=_depth)
 
     def serialize(self, chop_path=0, nchain=2, conv=None):
         """Serialize this entry for msgpack.