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

moat/kv/obj/__init__.py

@@ -2,6 +2,7 @@
 Object interface to moat.kv data
 
 """
+from __future__ import annotations
 
 import heapq
 import weakref
@@ -16,7 +17,16 @@ try:
 except ImportError:
     from async_generator import asynccontextmanager
 
-from moat.util import NoLock, NotGiven, Path, PathLongener, combine_dict, yload
+from moat.util import (
+    NoLock,
+    NotGiven,
+    Path,
+    PathLongener,
+    combine_dict,
+    yload,
+    ensure_cfg,
+    CFG,
+)
 
 __all__ = ["ClientEntry", "AttrClientEntry", "ClientRoot"]
 
@@ -148,7 +158,7 @@ class ClientEntry:
     @property
     def subpath(self):
         """Return the path to this entry, starting with its :class:`ClientRoot` base."""
-        return self._path[len(self.root._path) :]  # noqa: E203
+        return self._path[len(self.root._path) :]
 
     @property
     def all_children(self):
@@ -253,7 +263,11 @@ class ClientEntry:
         """
         async with NoLock if _locked else self._lock:
             r = await self.root.client.set(
-                self._path, chain=self.chain, value=value, nchain=3, idem=True
+                self._path,
+                chain=self.chain,
+                value=value,
+                nchain=3,
+                idem=True,
             )
             if wait:
                 await self.root.wait_chain(r.chain)
@@ -261,9 +275,7 @@ class ClientEntry:
             self.chain = r.chain
             return r
 
-    async def delete(
-        self, _locked=False, nchain=0, chain=True, wait=False, recursive=False
-    ):
+    async def delete(self, _locked=False, nchain=0, chain=True, wait=False, recursive=False):
         """Delete this node's value.
 
         This is a coroutine.
@@ -419,9 +431,7 @@ class MirrorRoot(ClientEntry):
             self._seen = dict()
 
     @classmethod
-    async def as_handler(
-        cls, client, cfg=None, key="prefix", subpath=(), name=None, **kw
-    ):
+    async def as_handler(cls, client, cfg=None, key="prefix", subpath=(), name=None, **kw):
         """Return an (or "the") instance of this class.
 
         The handler is created if it doesn't exist.
@@ -440,13 +450,15 @@ class MirrorRoot(ClientEntry):
             from pathlib import Path as _Path
 
             md = inspect.getmodule(cls)
+            ensure_cfg("moat.kv")
+            defcfg = CFG.kv.get(cls.CFG)
             try:
-                f = (_Path(md.__file__).parent / "_config.yaml").open("r")
-            except EnvironmentError:
+                f = (_Path(md.__file__).parent / "_nconfig.yaml").open("r")
+            except OSError:
                 pass
             else:
                 with f:
-                    defcfg = yload(f, attr=True).get("kv",{}).get(cls.CFG)
+                    defcfg = yload(f, attr=True).get("kv", {}).get(cls.CFG)
         if cfg:
             if defcfg:
                 cfg = combine_dict(cfg, defcfg)
@@ -461,9 +473,7 @@ class MirrorRoot(ClientEntry):
             name = str(Path("_moat.kv", client.name, cls.CFG, *subpath))
 
         def make():
-            return client.mirror(
-                cfg[key] + subpath, root_type=cls, need_wait=True, cfg=cfg, **kw
-            )
+            return client.mirror(cfg[key] + subpath, root_type=cls, need_wait=True, cfg=cfg, **kw)
 
         return await client.unique_helper(name, factory=make)
 
@@ -525,7 +535,10 @@ class MirrorRoot(ClientEntry):
                 pl = PathLongener(())
                 await self.run_starting()
                 async with self.client._stream(
-                    "watch", nchain=3, path=self._path, fetch=True
+                    "watch",
+                    nchain=3,
+                    path=self._path,
+                    fetch=True,
                 ) as w:
                     async for r in w:
                         if "path" not in r:
@@ -551,9 +564,7 @@ class MirrorRoot(ClientEntry):
                                 pass
 
                             # update entry
-                            entry.chain = (
-                                None if val is NotGiven else r.get("chain", None)
-                            )
+                            entry.chain = None if val is NotGiven else r.get("chain", None)
                             await entry.set_value(val)
 
                             if val is NotGiven and not entry:
@@ -620,7 +631,6 @@ class MirrorRoot(ClientEntry):
 
 
 class ClientRoot(MirrorRoot):
-
     """
     This class represents the root of a subsystem's storage.
 

moat/kv/obj/command.py

@@ -1,4 +1,5 @@
 # command line interface helpers for objects
+from __future__ import annotations
 
 import logging
 import sys
@@ -54,9 +55,7 @@ class _InvSub:
     def id_arg(self, proc):
         if self.id_name is None:
             return proc
-        return click.argument(
-            self.id_name, type=self.id_typ, callback=self.id_cb, nargs=1
-        )(proc)
+        return click.argument(self.id_name, type=self.id_typ, callback=self.id_cb, nargs=1)(proc)
 
     def apply_aux(self, proc):
         for t in self.aux:
@@ -106,13 +105,13 @@ def std_command(cli, *a, **kw):
         name=tname,
         invoke_without_command=True,
         short_help=tinv.short_help,
-        help="""\
-            Manager for {tlname}s.
+        help=f"""\
+            Manager for {tinv.long_name}s.
 
             \b
             Use '… {tname} -' to list all entries.
             Use '… {tname} NAME' to show details of a single entry.
-            """.format(tname=tname, tlname=tinv.long_name),
+            """,
     )
     @click.argument("name", type=str, nargs=1)
     @click.pass_context
@@ -123,9 +122,7 @@ def std_command(cli, *a, **kw):
 
         if name == "-":
             if ctx.invoked_subcommand is not None:
-                raise click.BadParameter(
-                    "The name '-' triggers a list and precludes subcommands."
-                )
+                raise click.BadParameter("The name '-' triggers a list and precludes subcommands.")
             cnt = 0
             for n in this(obj).all_children if tinv.list_recursive else this(obj):
                 cnt += 1
@@ -152,9 +149,7 @@ def std_command(cli, *a, **kw):
                                 else:
                                     vv = "-"
                             elif isinstance(vv, dict):
-                                vv = " ".join(
-                                    "%s=%s" % (x, y) for x, y in sorted(vv.items())
-                                )
+                                vv = " ".join("%s=%s" % (x, y) for x, y in sorted(vv.items()))
                             print("%s %s %s" % (k, kk, vv), file=obj.stdout)
                     else:
                         print("%s %s" % (k, v), file=obj.stdout)

moat/kv/runner.py

@@ -3,6 +3,7 @@ This module's job is to run code, resp. to keep it running.
 
 
 """
+from __future__ import annotations
 
 import time
 from collections.abc import Mapping
@@ -131,6 +132,7 @@ for _c in (
 
 _CLASSES["NotGiven"] = NotGiven  # ellipsis
 
+
 class CallAdmin:
     """
     This class collects some standard tasks which async MoaT-KV-embedded
@@ -169,9 +171,9 @@ class CallAdmin:
         """Called by the runner to actually execute the code."""
         self._logger.debug("Start %s with %s", self._runner._path, self._runner.code)
         async with (
-                anyio.create_task_group() as tg,
-                AsyncExitStack() as stack,
-                ):
+            anyio.create_task_group() as tg,
+            AsyncExitStack() as stack,
+        ):
             self._stack = stack
             self._taskgroup = tg
             self._runner.scope = sc = tg.cancel_scope
@@ -249,7 +251,7 @@ class CallAdmin:
             path = self._path
         r = await self._err.record_error("run", path, **kw)
         await self._err.root.wait_chain(r.chain)
-        raise ErrorRecorded()
+        raise ErrorRecorded
 
     async def open_context(self, ctx):
         return await self._stack.enter_async_context(ctx)
@@ -294,9 +296,7 @@ class CallAdmin:
                         async with slf.client.watch(path, **kw) as watcher:
                             yield watcher
                     else:
-                        raise RuntimeError(
-                            f"What should I do with a path marked {path.mark !r}?"
-                        )
+                        raise RuntimeError(f"What should I do with a path marked {path.mark!r}?")
 
                 with anyio.CancelScope() as sc:
                     slf.scope = sc
@@ -318,9 +318,7 @@ class CallAdmin:
                             elif msg.get("state", "") == "uptodate":
                                 slf.admin._n_watch_seen += 1
                                 if slf.admin._n_watch_seen == slf.admin._n_watch:
-                                    await slf.runner.send_event(
-                                        ReadyMsg(slf.admin._n_watch_seen)
-                                    )
+                                    await slf.runner.send_event(ReadyMsg(slf.admin._n_watch_seen))
 
             def cancel(slf):
                 if slf.scope is None:
@@ -361,7 +359,7 @@ class CallAdmin:
         if path.mark == "r":
             return await self.send(path, value)
         elif path.mark:
-            raise RuntimeError(f"What should I do with a path marked {path.mark !r}")
+            raise RuntimeError(f"What should I do with a path marked {path.mark!r}")
 
         if isinstance(path, (tuple, list)):
             path = Path.build(path)
@@ -556,7 +554,9 @@ class RunnerEntry(AttrClientEntry):
                     raise RuntimeError(f"already running on {state.node}")
                 code = self.root.code.follow(self.code, create=False)
                 data = combine_dict(
-                    self.data or {}, {} if code.value is NotGiven else code.value.get("default", {}), deep=True
+                    self.data or {},
+                    {} if code.value is NotGiven else code.value.get("default", {}),
+                    deep=True,
                 )
 
                 if code.is_async:
@@ -574,9 +574,7 @@ class RunnerEntry(AttrClientEntry):
 
                 await state.save(wait=True)
                 if state.node != state.root.name:
-                    raise RuntimeError(
-                        "Rudely taken away from us.", state.node, state.root.name
-                    )
+                    raise RuntimeError("Rudely taken away from us.", state.node, state.root.name)
 
                 data["_self"] = calls = CallAdmin(self, state, data)
                 res = await calls._run(code, data)
@@ -600,7 +598,11 @@ class RunnerEntry(AttrClientEntry):
             c, self._comment = self._comment, None
             with anyio.move_on_after(5, shield=True):
                 r = await self.root.err.record_error(
-                    "run", self._path, exc=exc, data=self.data, comment=c
+                    "run",
+                    self._path,
+                    exc=exc,
+                    data=self.data,
+                    comment=c,
                 )
                 if r is not None:
                     await self.root.err.wait_chain(r.chain)
@@ -803,7 +805,9 @@ class StateEntry(AttrClientEntry):
         self.node = None
         self.backoff = min(20, self.backoff + 1)
         await self.root.runner.err.record_error(
-            "run", self.runner._path, message="Runner restarted"
+            "run",
+            self.runner._path,
+            message="Runner restarted",
         )
         await self.save()
 
@@ -848,7 +852,7 @@ class StateEntry(AttrClientEntry):
             return
         elif self.node is None or n == self.root.runner.name:
             # Owch. Our job got taken away from us.
-            run._comment = f"Cancel: Node set to {self.node !r}"
+            run._comment = f"Cancel: Node set to {self.node!r}"
             run.scope.cancel()
         elif n is not None:
             logger.warning(
@@ -918,7 +922,8 @@ class StateRoot(MirrorRoot):
                 await self.update(val)
             else:
                 await self.client.msg_send(
-                    "run", {"group": self.runner.group, "time": t, "node": self.name}
+                    "run",
+                    {"group": self.runner.group, "time": t, "node": self.name},
                 )
 
 
@@ -961,9 +966,7 @@ class _BaseRunnerRoot(ClientRoot):
             cfg_ = client._cfg["runner"]
         else:
             cfg_ = combine_dict(cfg, client._cfg["runner"])
-        return await super().as_handler(
-            client, subpath=subpath, _subpath=subpath, cfg=cfg_, **kw
-        )
+        return await super().as_handler(client, subpath=subpath, _subpath=subpath, cfg=cfg_, **kw)
 
     async def run_starting(self):
         from .code import CodeRoot
@@ -984,7 +987,10 @@ class _BaseRunnerRoot(ClientRoot):
 
     async def _state_runner(self):
         self.state = await StateRoot.as_handler(
-            self.client, cfg=self._cfg, subpath=self._x_subpath, key="state"
+            self.client,
+            cfg=self._cfg,
+            subpath=self._x_subpath,
+            key="state",
         )
 
     @property
@@ -1014,7 +1020,7 @@ class _BaseRunnerRoot(ClientRoot):
 
         Its job is to control which tasks are started.
         """
-        raise RuntimeError("You want to override me." "")
+        raise RuntimeError("You want to override me.")
 
     async def trigger_rescan(self):
         """Tell the _run_actor task to rescan our job list prematurely"""
@@ -1096,9 +1102,7 @@ class AnyRunnerRoot(_BaseRunnerRoot):
     def __init__(self, *a, **kw):
         super().__init__(*a, **kw)
         self.group = (
-            P(self.client.config.server["root"]) + P(self._cfg["name"])
-            | "any"
-            | self._path[-1]
+            P(self.client.config.server["root"]) + P(self._cfg["name"]) | "any" | self._path[-1]
         )
 
     def get_node(self, name):
@@ -1116,7 +1120,10 @@ class AnyRunnerRoot(_BaseRunnerRoot):
         Monitor the Actor state, run a :meth:`_run_now` subtask whenever we're 'it'.
         """
         async with ClientActor(
-            self.client, self.name, topic=self.group, cfg=self._cfg["actor"]
+            self.client,
+            self.name,
+            topic=self.group,
+            cfg=self._cfg["actor"],
         ) as act:
             self._act = act
 
@@ -1176,7 +1183,7 @@ class AnyRunnerRoot(_BaseRunnerRoot):
         self._stale_times.append(cur)
         if self._stale_times[0] > cur - self.max_age:
             return
-        if len(self._stale_times) <= 2*self._cfg["actor"]["n_hosts"]+1:
+        if len(self._stale_times) <= 2 * self._cfg["actor"]["n_hosts"] + 1:
             return
         cut = self._stale_times.pop(0)
 
@@ -1278,9 +1285,7 @@ class SingleRunnerRoot(_BaseRunnerRoot):
         async with anyio.create_task_group() as tg:
             age_q = create_queue(1)
 
-            async with ClientActor(
-                self.client, self.name, topic=self.group, cfg=self._cfg
-            ) as act:
+            async with ClientActor(self.client, self.name, topic=self.group, cfg=self._cfg) as act:
                 self._act = act
                 tg.start_soon(self._age_notifier, age_q)
                 await self.spawn(self._run_now)
@@ -1330,9 +1335,7 @@ class AllRunnerRoot(SingleRunnerRoot):
     def __init__(self, *a, **kw):
         super().__init__(*a, **kw)
         self.group = (
-            P(self.client.config.server["root"]) + P(self._cfg["name"])
-            | "all"
-            | self._path[-1]
+            P(self.client.config.server["root"]) + P(self._cfg["name"]) | "all" | self._path[-1]
         )
 
     async def _state_runner(self):