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

moat/kv/server.py

@@ -5,12 +5,11 @@ import io
 import os
 import signal
 import time
-from pathlib import Path as FPath
 
 import anyio
 from anyio.abc import SocketAttribute
 from asyncscope import scope
-from moat.util import DelayedRead, DelayedWrite, create_queue, yload
+from moat.util import DelayedRead, DelayedWrite, create_queue, ensure_cfg
 
 try:
     from contextlib import asynccontextmanager
@@ -21,7 +20,7 @@ import logging
 from collections.abc import Mapping
 from functools import partial
 from pprint import pformat
-from typing import Any, Dict
+from typing import Any
 
 from asyncactor import (
     Actor,
@@ -151,9 +150,7 @@ class StreamCommand:
         self.client.in_stream[self.seq] = self
         self.qlen = self.client.qlen
         if self.qlen:
-            self.qr = DelayedRead(
-                self.qlen, get_seq=self._get_seq, send_ack=self._send_ack
-            )
+            self.qr = DelayedRead(self.qlen, get_seq=self._get_seq, send_ack=self._send_ack)
             self.dw = DelayedWrite(self.qlen)
         else:
             self.qr = create_queue(1)
@@ -227,9 +224,7 @@ class StreamCommand:
                     await self.send(**res)
             except Exception as exc:
                 if not isinstance(exc, CancelledError):
-                    self.client.logger.exception(
-                        "ERS%d %r", self.client._client_nr, self.msg
-                    )
+                    self.client.logger.exception("ERS%d %r", self.client._client_nr, self.msg)
                 await self.send(error=repr(exc))
             finally:
                 with anyio.move_on_after(2, shield=True):
@@ -547,7 +542,11 @@ class SCmd_watch(StreamCommand):
         client = self.client
         conv = client.conv
         entry, acl = client.root.follow_acl(
-            msg.path, acl=client.acl, acl_key="x", create=True, nulls_ok=client.nulls_ok
+            msg.path,
+            acl=client.acl,
+            acl_key="x",
+            create=True,
+            nulls_ok=client.nulls_ok,
         )
         nchain = msg.get("nchain", 0)
         max_depth = msg.get("max_depth", -1)
@@ -602,7 +601,9 @@ class SCmd_watch(StreamCommand):
                         a = a.step(p)
                     else:
                         res = m.entry.serialize(
-                            chop_path=client._chop_path, nchain=nchain, conv=conv
+                            chop_path=client._chop_path,
+                            nchain=nchain,
+                            conv=conv,
                         )
                         shorter(res)
                         if not a.allows("r"):
@@ -661,7 +662,7 @@ class ServerClient:
     tg = None
     qlen = 0
 
-    def __init__(self, server: "Server", stream: Stream):
+    def __init__(self, server: Server, stream: Stream):
         self.server = server
         self.root = server.root
         self.metaroot = self.root.follow(Path(None), create=True, nulls_ok=True)
@@ -707,9 +708,7 @@ class ServerClient:
         with anyio.CancelScope() as s:
             self.tasks[seq] = s
             if "chain" in msg:
-                msg.chain = NodeEvent.deserialize(
-                    msg.chain, cache=self.server.node_cache
-                )
+                msg.chain = NodeEvent.deserialize(msg.chain, cache=self.server.node_cache)
 
             fn = None
             if msg.get("state", "") != "start":
@@ -848,7 +847,11 @@ class ServerClient:
                 acl2 = root.follow(Path(None, "acl", acl2), create=False, nulls_ok=True)
                 acl2 = ACLFinder(acl2)
                 _entry, acl = root.follow_acl(
-                    msg.path, acl=acl2, acl_key=mode, nulls_ok=False, create=None
+                    msg.path,
+                    acl=acl2,
+                    acl_key=mode,
+                    nulls_ok=False,
+                    create=None,
                 )
                 if not ok:
                     acl.block("a")
@@ -865,7 +868,11 @@ class ServerClient:
         if with_data is None:
             with_data = msg.get("with_data", False)
         entry, acl = root.follow_acl(
-            msg.path, acl=self.acl, acl_key="e", create=False, nulls_ok=_nulls_ok
+            msg.path,
+            acl=self.acl,
+            acl_key="e",
+            create=False,
+            nulls_ok=_nulls_ok,
         )
         empty = msg.get("empty", False)
         if with_data:
@@ -908,7 +915,9 @@ class ServerClient:
         if "node" in msg and "path" not in msg:
             n = Node(msg.node, cache=self.server.node_cache, create=False)
             return n[msg.tick].serialize(
-                chop_path=self._chop_path, nchain=msg.get("nchain", 0), conv=self.conv
+                chop_path=self._chop_path,
+                nchain=msg.get("nchain", 0),
+                conv=self.conv,
             )
 
         if _nulls_ok is None:
@@ -917,16 +926,18 @@ class ServerClient:
             root = self.root
         try:
             entry, _ = root.follow_acl(
-                msg.path, create=False, acl=self.acl, acl_key="r", nulls_ok=_nulls_ok
+                msg.path,
+                create=False,
+                acl=self.acl,
+                acl_key="r",
+                nulls_ok=_nulls_ok,
             )
         except KeyError:
             entry = {}
             if msg.get("nchain", 0):
                 entry["chain"] = None
         else:
-            entry = entry.serialize(
-                chop_path=-1, nchain=msg.get("nchain", 0), conv=self.conv
-            )
+            entry = entry.serialize(chop_path=-1, nchain=msg.get("nchain", 0), conv=self.conv)
         return entry
 
     async def cmd_set_value(self, msg, **kw):
@@ -955,9 +966,7 @@ class ServerClient:
         entry, acl = root.follow_acl(msg.path, acl=acl, acl_key="W", nulls_ok=_nulls_ok)
         if root is self.root and "match" in self.metaroot:
             try:
-                self.metaroot["match"].check_value(
-                    None if value is NotGiven else value, entry
-                )
+                self.metaroot["match"].check_value(None if value is NotGiven else value, entry)
             except ClientError:
                 raise
             except Exception as exc:
@@ -968,11 +977,7 @@ class ServerClient:
         send_prev = True
         nchain = msg.get("nchain", 1)
 
-        if (
-            msg.get("idem", False)
-            and type(entry.data) is type(value)
-            and entry.data == value
-        ):
+        if msg.get("idem", False) and type(entry.data) is type(value) and entry.data == value:
             res = attrdict(tock=entry.tock, changed=False)
             if nchain > 0:
                 res.chain = entry.chain.serialize(nchain=nchain)
@@ -980,9 +985,7 @@ class ServerClient:
 
         if "prev" in msg:
             if entry.data != msg.prev:
-                raise ClientError(
-                    f"Data is {entry.data !r} not {msg.prev !r} at {msg.path}"
-                )
+                raise ClientError(f"Data is {entry.data!r} not {msg.prev!r} at {msg.path}")
             send_prev = False
         if "chain" in msg:
             if msg.chain is None:
@@ -992,7 +995,7 @@ class ServerClient:
                 raise ClientChainError(f"Entry is new at {msg.path}")
             elif entry.chain != msg.chain:
                 raise ClientChainError(
-                    f"Chain is {entry.chain !r} not {msg.chain !r} for {msg.path}"
+                    f"Chain is {entry.chain!r} not {msg.chain!r} for {msg.path}",
                 )
             send_prev = False
 
@@ -1009,9 +1012,7 @@ class ServerClient:
         async with self.server.next_event() as event:
             await entry.set_data(
                 event,
-                NotGiven
-                if value is NotGiven
-                else self.conv.dec_value(value, entry=entry),
+                NotGiven if value is NotGiven else self.conv.dec_value(value, entry=entry),
                 server=self.server,
                 tock=self.server.tock,
             )
@@ -1085,7 +1086,10 @@ class ServerClient:
 
         try:
             entry, acl = self.root.follow_acl(
-                msg.path, acl=self.acl, acl_key="d", nulls_ok=self.nulls_ok
+                msg.path,
+                acl=self.acl,
+                acl_key="d",
+                nulls_ok=self.nulls_ok,
             )
         except KeyError:
             return False
@@ -1094,9 +1098,7 @@ class ServerClient:
             res = 0
             if entry.data is not None and acl.allows("d"):
                 async with self.server.next_event() as event:
-                    evt = await entry.set_data(
-                        event, NotGiven, server=self, tock=self.server.tock
-                    )
+                    evt = await entry.set_data(event, NotGiven, server=self, tock=self.server.tock)
                     if nchain:
                         r = evt.serialize(
                             chop_path=self._chop_path,
@@ -1152,9 +1154,7 @@ class ServerClient:
         if msg.typ is None:
             val.pop("current", None)
         elif msg.typ not in a or not len(a[msg.typ]["user"].keys()):
-            raise RuntimeError(
-                "You didn't configure this method yet:" + repr((msg.typ, vars(a)))
-            )
+            raise RuntimeError("You didn't configure this method yet:" + repr((msg.typ, vars(a))))
         else:
             val["current"] = msg.typ
         msg.value = val
@@ -1238,13 +1238,13 @@ class ServerClient:
                             await evt.wait()
                     except Exception as exc:
                         msg = {"error": str(exc)}
-                        if isinstance(
-                            exc, ClientError
-                        ):  # pylint doesn't seem to see this, so …:
+                        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(
-                                "ERR %d: Client error on %s", self._client_nr, repr(msg)
+                                "ERR %d: Client error on %s",
+                                self._client_nr,
+                                repr(msg),
                             )
                         if seq is not None:
                             msg["seq"] = seq
@@ -1357,7 +1357,7 @@ class Server:
       name (str): the name of this MoaT-KV server instance.
         It **must** be unique.
       cfg: configuration.
-        See ``_config.yaml`` for default values.
+        See ``_cfg.yaml`` for default values.
         Relevant is the ``kv.server`` sub-dict (mostly).
       init (Any):
         The initial content of the root entry. **Do not use this**, except
@@ -1381,7 +1381,10 @@ class Server:
 
     def __init__(self, name: str, cfg: dict = None, init: Any = NotGiven):
         self.root = RootEntry(self, tock=self.tock)
-        CFG = yload(FPath(__file__).parent / "_config.yaml")["kv"]
+        from moat.util import CFG
+
+        ensure_cfg("moat.kv")
+        CFG = CFG["kv"]
 
         self.cfg = combine_dict(cfg or {}, CFG, cls=attrdict)
         csr = self.cfg.server["root"]
@@ -1390,7 +1393,7 @@ class Server:
 
         self.paranoid_root = self.root if self.cfg.server.paranoia else None
 
-        self._nodes: Dict[str, Node] = {}
+        self._nodes: dict[str, Node] = {}
         self.node_drop = set()
         self.node = Node(name, None, cache=self.node_cache)
 
@@ -1473,9 +1476,7 @@ class Server:
                 yield n
             except BaseException as exc:
                 if n is not None:
-                    self.logger.warning(
-                        "Deletion %s %d due to %r", self.node, n.tick, exc
-                    )
+                    self.logger.warning("Deletion %s %d due to %r", self.node, n.tick, exc)
                     self.node.report_deleted(
                         RangeSet((nt,)),
                         self,  # pylint: disable=used-before-assignment
@@ -1598,7 +1599,10 @@ class Server:
         async def send_nodes():
             nonlocal nodes, n_nodes
             await client._request(  # pylint: disable=cell-var-from-loop
-                "check_deleted", iter=False, nchain=-1, nodes=nodes.serialize()
+                "check_deleted",
+                iter=False,
+                nchain=-1,
+                nodes=nodes.serialize(),
             )
             nodes.clear()
             n_nodes = 0
@@ -1739,9 +1743,7 @@ class Server:
         """
         Process an update message: deserialize it and apply the result.
         """
-        msg = UpdateEvent.deserialize(
-            self.root, msg, cache=self.node_cache, nulls_ok=True
-        )
+        msg = UpdateEvent.deserialize(self.root, msg, cache=self.node_cache, nulls_ok=True)
         await msg.entry.apply(msg, server=self, root=self.paranoid_root)
 
     async def user_info(self, msg):
@@ -1841,7 +1843,7 @@ class Server:
             j = i
             while i:
                 i -= 1
-                msg[f"_p{i+1}"] = msg[f"_p{i}"]
+                msg[f"_p{i + 1}"] = msg[f"_p{i}"]
             if j:
                 msg["_p0"] = ""
 
@@ -1887,8 +1889,8 @@ class Server:
                 msg["_p0"] = ""
 
             i = 0
-            while f"_p{i+1}" in msg:
-                msg[f"_p{i}"] = msg[f"_p{i+1}"]
+            while f"_p{i + 1}" in msg:
+                msg[f"_p{i}"] = msg[f"_p{i + 1}"]
                 i += 1
             del msg[f"_p{i}"]
         return msg
@@ -2015,9 +2017,7 @@ class Server:
         try:
             # First try to read the host name from the meta-root's
             # "hostmap" entry, if any.
-            hme = self.root.follow(
-                Path(None, "hostmap", host), create=False, nulls_ok=True
-            )
+            hme = self.root.follow(Path(None, "hostmap", host), create=False, nulls_ok=True)
             if hme.data is NotGiven:
                 raise KeyError(host)
         except KeyError:
@@ -2123,7 +2123,10 @@ class Server:
                     async for r in res:
                         pl(r)
                         r = UpdateEvent.deserialize(
-                            self.root, r, cache=self.node_cache, nulls_ok=True
+                            self.root,
+                            r,
+                            cache=self.node_cache,
+                            nulls_ok=True,
                         )
                         await r.entry.apply(r, server=self, root=self.paranoid_root)
                     await self.tock_seen(res.end_msg.tock)
@@ -2139,7 +2142,10 @@ class Server:
                     async for r in res:
                         pl(r)
                         r = UpdateEvent.deserialize(
-                            self.root, r, cache=self.node_cache, nulls_ok=True
+                            self.root,
+                            r,
+                            cache=self.node_cache,
+                            nulls_ok=True,
                         )
                         await r.entry.apply(r, server=self, root=self.paranoid_root)
                     await self.tock_seen(res.end_msg.tock)
@@ -2172,9 +2178,7 @@ class Server:
                 if len(self.fetch_missing):
                     self.fetch_running = False
                     for nm in self.fetch_missing:
-                        self.logger.error(
-                            "Sync: missing: %s %s", nm.name, nm.local_missing
-                        )
+                        self.logger.error("Sync: missing: %s %s", nm.name, nm.local_missing)
                     await self.spawn(self.do_send_missing)
                 if self.force_startup or not len(self.fetch_missing):
                     if self.node.tick is None:
@@ -2354,9 +2358,7 @@ class Server:
         if prio is None:
             await anyio.sleep(clock * (1 + self._actor.random / 3))
         else:
-            await anyio.sleep(
-                clock * (1 - (1 / (1 << prio)) / 2 - self._actor.random / 5)
-            )
+            await anyio.sleep(clock * (1 - (1 / (1 << prio)) / 2 - self._actor.random / 5))
 
         self.logger.debug("SendMissingGo %s %s", prio, self.sending_missing)
         while self.sending_missing:
@@ -2431,18 +2433,12 @@ class Server:
                         await self.tock_seen(m.tock)
                     else:
                         m.tock = self.tock
-                    m = UpdateEvent.deserialize(
-                        self.root, m, cache=self.node_cache, nulls_ok=True
-                    )
+                    m = UpdateEvent.deserialize(self.root, m, cache=self.node_cache, nulls_ok=True)
                     await self.tock_seen(m.tock)
-                    await m.entry.apply(
-                        m, server=self, root=self.paranoid_root, loading=True
-                    )
+                    await m.entry.apply(m, server=self, root=self.paranoid_root, loading=True)
                 elif "info" in m:
                     await self._process_info(m["info"])
-                elif (
-                    "nodes" in m or "known" in m or "deleted" in m or "tock" in m
-                ):  # XXX LEGACY
+                elif "nodes" in m or "known" in m or "deleted" in m or "tock" in m:  # XXX LEGACY
                     await self._process_info(m)
                 else:
                     self.logger.warning("Unknown message in stream: %s", repr(m))
@@ -2560,7 +2556,11 @@ class Server:
                             cnt += 1
 
     async def _saver(
-        self, path: str = None, stream=None, done: ValueEvent = None, save_state=False
+        self,
+        path: str = None,
+        stream=None,
+        done: ValueEvent = None,
+        save_state=False,
     ):
         with anyio.CancelScope() as s:
             sd = anyio.Event()
@@ -2574,7 +2574,7 @@ class Server:
                     done_val=s,
                     save_state=save_state,
                 )
-            except EnvironmentError as err:
+            except OSError as err:
                 if done is None:
                     raise
                 done.set_error(err)
@@ -2582,9 +2582,7 @@ class Server:
                 with anyio.CancelScope(shield=True):
                     sd.set()
 
-    async def run_saver(
-        self, path: str = None, stream=None, save_state=False, wait: bool = True
-    ):
+    async def run_saver(self, path: str = None, stream=None, save_state=False, wait: bool = True):
         """
         Start a task that continually saves to disk.
 
@@ -2611,7 +2609,7 @@ class Server:
                     stream=stream,
                     save_state=save_state,
                     done=done,
-                )
+                ),
             )
             if wait:
                 res = await done.get()
@@ -2732,9 +2730,7 @@ class Server:
                 assert self.node.tick is None
                 self.node.tick = 0
                 async with self.next_event() as event:
-                    await self.root.set_data(
-                        event, self._init, tock=self.tock, server=self
-                    )
+                    await self.root.set_data(event, self._init, tock=self.tock, server=self)
 
             await self.spawn(self._sigterm)
 

moat/kv/types.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import weakref
 
@@ -302,13 +303,11 @@ class CodecEntry(Entry):
                     r = dec(v)
                 except Exception as exc:
                     raise ValueError(
-                        f"failed decoder at {self.path} on {v!r} with {exc!r}"
+                        f"failed decoder at {self.path} on {v!r} with {exc!r}",
                     ) from exc
                 else:
                     if r != w:
-                        raise ValueError(
-                            f"Decoding at {self.path}: {v!r} got {r!r}, not {w!r}"
-                        )
+                        raise ValueError(f"Decoding at {self.path}: {v!r} got {r!r}, not {w!r}")
 
         if value is not None and value.encode is not None:
             if not value["out"]:
@@ -319,13 +318,11 @@ class CodecEntry(Entry):
                     r = enc(v)
                 except Exception as exc:
                     raise ValueError(
-                        f"failed encoder at {self.path} on {v!r} with {exc!r}"
+                        f"failed encoder at {self.path} on {v!r} with {exc!r}",
                     ) from exc
                 else:
                     if r != w:
-                        raise ValueError(
-                            f"Encoding at {self.path}: {v!r} got {r!r}, not {w!r}"
-                        )
+                        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.70.22.dist-info → moat_kv-0.70.24.dist-info}/METADATA

@@ -1,15 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moat-kv
-Version: 0.70.22
+Version: 0.70.24
 Summary: A distributed no-master key-value store
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
-Project-URL: repository, https://github.com/M-o-a-T/moat-kv
+Project-URL: repository, https://github.com/M-o-a-T/moat
 Keywords: MoaT
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: Trio
 Classifier: Operating System :: POSIX :: Linux
@@ -21,28 +19,27 @@ Classifier: Topic :: Home Automation
 Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
-License-File: LICENSE
-License-File: LICENSE.APACHE2
-License-File: LICENSE.MIT
-Requires-Dist: PyNaCl>=1.3
+License-File: LICENSE.txt
+Requires-Dist: asyncclick>7.99
+Requires-Dist: trio>=0.22
 Requires-Dist: anyio>=4
+Requires-Dist: range_set>=0.2
+Requires-Dist: attrs>=22
+Requires-Dist: asyncserf>=0.16
 Requires-Dist: asyncactor>=0.24
-Requires-Dist: asyncclick>7.99
 Requires-Dist: asyncscope>=0.10.4
-Requires-Dist: asyncserf>=0.16
-Requires-Dist: attrs>=22
 Requires-Dist: jsonschema>=2.5
-Requires-Dist: moat-lib-diffiehellman~=0.13.1.6
-Requires-Dist: moat-mqtt~=0.39.4
-Requires-Dist: moat-util>=0.51.3
-Requires-Dist: psutil
-Requires-Dist: range-set>=0.2
 Requires-Dist: ruyaml>=0.89
+Requires-Dist: PyNaCl>=1.3
+Requires-Dist: moat-lib-diffiehellman~=0.13.4
+Requires-Dist: psutil
 Requires-Dist: simpleeval>=0.9.10
-Requires-Dist: trio>=0.22
+Requires-Dist: moat-mqtt~=0.42.3
+Requires-Dist: moat-util~=0.56.4
 Requires-Dist: exceptiongroup; python_version < "3.11"
 Provides-Extra: dev
 Requires-Dist: moat-src>=0.5.0; extra == "dev"
+Dynamic: license-file
 
 =======
 MoaT-KV