moat-kv 0.70.22__tar.gz → 0.70.24__tar.gz

moat_kv-0.70.24/LICENSE.txt

@@ -0,0 +1,14 @@
+The code in this repository, and all MoaT submodules it refers to,
+is part of the MoaT project.
+
+Unless a submodule's LICENSE.txt states otherwise, all included files are
+licensed under the LGPL V3, as published by the FSF at
+https://www.gnu.org/licenses/lgpl-3.0.html .
+
+In addition to the LGPL's terms, the author(s) respectfully ask all users of
+this code to contribute any bug fixes or enhancements. Also, please link back to
+https://M-o-a-T.org.
+
+Thank you.
+
+Copyright © 2021 ff.: the MoaT contributor(s), as per the git changelog(s).

{moat_kv-0.70.22 → moat_kv-0.70.24}/PKG-INFO

@@ -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,9 +19,7 @@ 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
+License-File: LICENSE.txt
 Requires-Dist: asyncclick>7.99
 Requires-Dist: trio>=0.22
 Requires-Dist: anyio>=4
@@ -35,14 +31,15 @@ Requires-Dist: asyncscope>=0.10.4
 Requires-Dist: jsonschema>=2.5
 Requires-Dist: ruyaml>=0.89
 Requires-Dist: PyNaCl>=1.3
-Requires-Dist: moat-lib-diffiehellman~=0.13.1.6
+Requires-Dist: moat-lib-diffiehellman~=0.13.4
 Requires-Dist: psutil
 Requires-Dist: simpleeval>=0.9.10
-Requires-Dist: moat-mqtt~=0.39.4
-Requires-Dist: moat-util>=0.51.3
+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

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/docs/source/conf.py

@@ -19,8 +19,9 @@
 #
 import os
 import sys
+
 # So autodoc can import our package
-sys.path.insert(0, os.path.abspath('../..'))
+sys.path.insert(0, os.path.abspath("../.."))
 
 # Warn about all references to unknown targets
 nitpicky = True
@@ -44,16 +45,16 @@ autodoc_inherit_docstrings = False
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.coverage',
-    'sphinx.ext.napoleon',
-    'sphinxcontrib_trio',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.coverage",
+    "sphinx.ext.napoleon",
+    "sphinxcontrib_trio",
 ]
 
 intersphinx_mapping = {
-    "python": ('https://docs.python.org/3', None),
-    "trio": ('https://trio.readthedocs.io/en/stable', None),
+    "python": ("https://docs.python.org/3", None),
+    "trio": ("https://trio.readthedocs.io/en/stable", None),
 }
 
 autodoc_member_order = "bysource"
@@ -65,15 +66,15 @@ templates_path = []
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'MoaT-KV'
-copyright = 'The MoaT-KV authors'
-author = 'The MoaT-KV authors'
+project = "MoaT-KV"
+copyright = "The MoaT-KV authors"
+author = "The MoaT-KV authors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -81,6 +82,7 @@ author = 'The MoaT-KV authors'
 #
 # The short X.Y version.
 import pkg_resources
+
 version = pkg_resources.get_distribution("moat.kv")._version
 
 # The full version, including alpha/beta/rc tags.
@@ -99,10 +101,10 @@ language = None
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # The default language for :: blocks
-highlight_language = 'python3'
+highlight_language = "python3"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -113,13 +115,14 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-#html_theme = 'alabaster'
+# html_theme = 'alabaster'
 
 # We have to set this ourselves, not only because it's useful for local
 # testing, but also because if we don't then RTD will throw away our
 # html_theme_options.
 import sphinx_rtd_theme
-html_theme = 'sphinx_rtd_theme'
+
+html_theme = "sphinx_rtd_theme"
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
@@ -139,13 +142,13 @@ html_theme_options = {
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'moat.kv-doc'
+htmlhelp_basename = "moat.kv-doc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -154,15 +157,12 @@ latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -172,8 +172,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'moat.kv.tex', 'Trio Documentation',
-     author, 'manual'),
+    (master_doc, "moat.kv.tex", "Trio Documentation", author, "manual"),
 ]
 
 
@@ -181,10 +180,7 @@ latex_documents = [
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'moat.kv', 'MoaT-KV Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "moat.kv", "MoaT-KV Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -193,7 +189,13 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'moat.kv', 'MoaT-KV Documentation',
-     author, 'MoaT-KV', 'A distributed no-master key-value store',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "moat.kv",
+        "MoaT-KV Documentation",
+        author,
+        "MoaT-KV",
+        "A distributed no-master key-value store",
+        "Miscellaneous",
+    ),
 ]

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/examples/pathify.py

@@ -9,19 +9,21 @@ from moat.kv.client import open_client
 from moat.util import P, yload, Path
 import asyncclick as click
 
-def conv(m,s: str) -> bool:
+
+def conv(m, s: str) -> bool:
     try:
         d = m.value[s]
     except KeyError:
         return 0
-    if isinstance(d,Path):
+    if isinstance(d, Path):
         return 0
-    if not isinstance(d,Sequence):
+    if not isinstance(d, Sequence):
         return 0
     d = Path.build(d)
     m.value[s] = d
     return 1
 
+
 @click.command()
 @click.argument("path", type=P)
 @click.argument("keys", type=str, nargs=-1)
@@ -34,10 +36,10 @@ async def main(path, keys):
         async for m in client.get_tree(path, nchain=2):
             n = 0
             for k in keys:
-                n += conv(m,k)
+                n += conv(m, k)
             if n:
-                await client.set(ORIG+m.path, value=m.value, chain=m.chain)
+                await client.set(ORIG + m.path, value=m.value, chain=m.chain)
+
 
 if __name__ == "__main__":
     main()
-

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/__init__.py

@@ -1,4 +1,5 @@
 # pylint: disable=W0703,C0103
+from __future__ import annotations
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 

moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages/moat/kv/_cfg.yaml

@@ -0,0 +1,97 @@
+conn:
+  # client: controls how to talk to the MoaT-KV server
+  host: localhost
+  port: 27586
+  ssl: false
+  # ssl:
+  #   cert: '/path/to/cert.pem',key='/path/to/cert.key'
+  init_timeout: 5
+  # time to wait for connection plus greeting
+  auth: null
+  # no auth used by default
+  name: null
+  # defaults to a seqnum
+config:
+  prefix: !P :.moat.kv.config
+errors:
+  prefix: !P :.moat.kv.error
+codes:
+  prefix: !P :.moat.kv.code.proc
+modules:
+  prefix: !P :.moat.kv.code.module
+runner: # for moat.kv.runner.RunnerRoot
+  # storage for runnable commands
+  prefix: !P :.moat.kv.run"
+  # storage for runner states
+  state: !P :.moat.kv.state"
+
+  name: "run"
+  # Serf event name, suffixed by subpath
+
+  start_delay: 1
+  # time to wait between job starts. Not optional.
+
+  ping: -15
+  # set an I-am-running message every those-many seconds
+  # positive: set in moat.kv, negative: broadcast to :moat.kv.run tag
+
+  actor:
+    # Actor config, required for Runner
+    cycle: 20
+    nodes: -1
+    splits: 5
+    n_hosts: 3
+    version: 1
+  sub:
+    # tags for various runner modes
+    group: "any"
+    single: "at"
+    all: "all"
+server:
+  # server-side configuration
+  buffer: 10
+  # per-stream buffer
+
+  backend: "mqtt"
+  # default
+  mqtt:
+    uri: "mqtt://localhost:1883"
+  serf:
+    host: "localhost"
+    port: 7373
+
+  # event message path/topic prefix
+  root: !P moat.kv
+
+  paranoia: False
+  # typecheck server-to-server updates?
+  #
+  # which addresses/ports to accept MoaT-KV connections on
+  bind: [{}]
+  bind_default:
+    # default values for all elements of "bind"
+    host: "localhost"
+    port: PORT
+    ssl: False
+  change:
+    length: 5
+    # chain length: use max nr of network sections +1
+  ping:
+    cycle: 10
+    gap: 2
+    # asyncserf.Actor config timing for server sync
+  # ping also controls minimum server startup time
+  delete:
+    # asyncserf.Actor config timing for deletion
+    cycle: 100
+    gap: 10
+    version: 1
+paranoia: false
+# typecheck server>server updates?
+
+# how does a new server reach existing nodes, to download state?
+domain: null
+# domain in which to look up node names, if not in hostmap
+hostmap:   # map MoaT-KV server names to connect destinations
+  test1: ["localhost", 27586]
+  test2: ["does-not-exist.invalid", 27586]

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/_main.py

@@ -4,11 +4,12 @@ Basic DistKV support
 
 """
 
+from __future__ import annotations
+
 import logging
-from pathlib import Path
 
 import asyncclick as click
-from moat.util import attrdict, combine_dict, load_subgroup, yload
+from moat.util import attrdict, combine_dict, load_subgroup, CFG, ensure_cfg
 
 from moat.kv.auth import gen_auth
 from moat.kv.client import client_scope
@@ -16,7 +17,7 @@ from moat.kv.client import client_scope
 logger = logging.getLogger(__name__)
 
 
-CFG = yload(Path(__file__).parent / "_config.yaml", attr=True)
+ensure_cfg("moat.kv")
 
 
 class NullObj:
@@ -40,12 +41,8 @@ class NullObj:
         raise self._exc
 
 
-@load_subgroup(
-    sub_pre="moat.kv.command", sub_post="cli", ext_pre="moat.kv", ext_post="_main.cli"
-)
-@click.option(
-    "-h", "--host", default=None, help=f"Host to use. Default: {CFG.kv.conn.host}"
-)
+@load_subgroup(sub_pre="moat.kv.command", sub_post="cli", ext_pre="moat.kv", ext_post="_main.cli")
+@click.option("-h", "--host", default=None, help=f"Host to use. Default: {CFG.kv.conn.host}")
 @click.option(
     "-p",
     "--port",

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/actor/__init__.py

@@ -2,8 +2,9 @@
 This module implements a :class:`asyncactor.Actor` which works on top of
 a MoaT-KV client.
 """
+from __future__ import annotations
 
-from asyncactor import Actor  # noqa
+from asyncactor import Actor
 from asyncactor.abc import MonitorStream, Transport
 
 __all__ = [

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/actor/deletor.py

@@ -3,6 +3,8 @@ This module implements additional code for the server-side DeleteActor,
 which is used to clean up the list of deleted nodes.
 """
 
+from __future__ import annotations
+
 import weakref
 from collections import deque
 
@@ -41,7 +43,7 @@ class DeleteActor:
         self.tags = self.tags[-TAGS:]
         await self.actor.set_value((self.tags[0], self.tags[-1]))
 
-    def add_deleted(self, nodes: "NodeSet"):  # noqa: F821
+    def add_deleted(self, nodes: NodeSet):  # noqa: F821
         """
         These nodes are deleted. Remember them for some time.
         """

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/auth/__init__.py

@@ -59,6 +59,8 @@ The server process is:
 
 """
 
+from __future__ import annotations
+
 import io
 from importlib import import_module
 
@@ -87,7 +89,7 @@ add_schema = {
             "additionalProperties": False,
             "properties": {"key": {type: "string", "minLength": 1}},
         },
-    }
+    },
 }
 
 
@@ -111,7 +113,7 @@ def gen_auth(s: str):
 
     m, *p = s.split()
     if len(p) == 0 and m[0] == "=":
-        with io.open(m[1:], "r", encoding="utf-8") as f:
+        with open(m[1:], encoding="utf-8") as f:
             kw = yload(f)
             m = kw.pop("type")
     else:
@@ -147,7 +149,7 @@ async def null_server_login(stream):
     return stream
 
 
-async def null_client_login(stream, user: "BaseClientAuth"):  # pylint: disable=unused-argument
+async def null_client_login(stream, user: BaseClientAuth):  # pylint: disable=unused-argument
     return stream
 
 
@@ -342,9 +344,7 @@ class BaseServerAuth(_AuthLoaded):
 
         try:
             data = data["conv"].data["key"]
-            res, _ = root.follow_acl(
-                Path(None, "conv", data), create=False, nulls_ok=True
-            )
+            res, _ = root.follow_acl(Path(None, "conv", data), create=False, nulls_ok=True)
             return res
         except (KeyError, AttributeError):
             return ConvNull
@@ -354,9 +354,7 @@ class BaseServerAuth(_AuthLoaded):
             data = data["acl"].data["key"]
             if data == "*":
                 return NullACL
-            acl, _ = root.follow_acl(
-                Path(None, "acl", data), create=False, nulls_ok=True
-            )
+            acl, _ = root.follow_acl(Path(None, "acl", data), create=False, nulls_ok=True)
             return ACLFinder(acl)
         except (KeyError, AttributeError):
             return NullACL
@@ -422,7 +420,7 @@ class BaseServerAuthMaker(_AuthLoaded):
         cls,
         cmd: StreamCommand,
         data: attrdict,  # pylint: disable=unused-argument
-    ) -> "BaseServerAuthMaker":
+    ) -> BaseServerAuthMaker:
         """Create/update a new user by reading the record from the client"""
         dt = data.get("data", None) or {}
         jsonschema.validate(instance=dt, schema=cls.schema)

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/auth/_test.py

@@ -5,6 +5,8 @@ Test auth method.
 Does not limit anything, allows everything.
 """
 
+from __future__ import annotations
+
 import logging
 
 log = logging.getLogger(__name__)
@@ -62,9 +64,7 @@ class ServerUserMaker(BaseServerAuthMaker):
         await cmd.send(step="SendWant")
         msg = await cmd.recv()
         assert msg.step == "WantName"
-        await cmd.send(
-            step="SendName", name=self.name, chain=self._chain.serialize(nchain=3)
-        )
+        await cmd.send(step="SendName", name=self.name, chain=self._chain.serialize(nchain=3))
         msg = await cmd.recv()
 
     # Annoying methods to read+save the user name from/to KV
@@ -84,17 +84,13 @@ class ClientUserMaker(BaseClientAuthMaker):
     gen_schema = dict(
         type="object",
         additionalProperties=False,
-        properties=dict(
-            name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")
-        ),
+        properties=dict(name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")),
         required=["name"],
     )
     mod_schema = dict(
         type="object",
         additionalProperties=False,
-        properties=dict(
-            name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")
-        ),
+        properties=dict(name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")),
         # required=[],
     )
     name = None
@@ -154,9 +150,7 @@ class ClientUser(BaseClientAuth):
     schema = dict(
         type="object",
         additionalProperties=False,
-        properties=dict(
-            name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")
-        ),
+        properties=dict(name=dict(type="string", minLength=1, pattern="^[a-zA-Z][a-zA-Z0-9_]*$")),
         required=["name"],
     )
     _name = None

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/auth/password.py

@@ -5,6 +5,8 @@ Password-based auth method.
 Does not limit anything, allows everything.
 """
 
+from __future__ import annotations
+
 import nacl.secret
 
 from ..client import Client, NoData

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/auth/root.py

@@ -5,6 +5,8 @@ Null auth method.
 Does not limit anything, allows everything.
 """
 
+from __future__ import annotations
+
 from . import (
     BaseClientAuth,
     BaseClientAuthMaker,

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/backend/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from abc import ABCMeta, abstractmethod
 from contextlib import asynccontextmanager
 

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/backend/mqtt.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
 import logging
 from contextlib import asynccontextmanager
 
 import anyio
 from moat.mqtt.client import MQTTClient
 from moat.mqtt.codecs import NoopCodec
+from moat.util import NotGiven
 
 from . import Backend
 
@@ -24,9 +26,7 @@ class MqttBackend(Backend):
 
     @asynccontextmanager
     async def connect(self, *a, **kw):
-        codec = kw.pop("codec", None)
-        if codec is None:
-            codec = NoopCodec()
+        codec = kw.pop("codec", NotGiven)
         C = MQTTClient(self._tg, codec=codec)
         try:
             await C.connect(*a, **kw)

{moat_kv-0.70.22 → moat_kv-0.70.24/debian/moat-kv/usr/lib/python3/dist-packages}/moat/kv/backend/serf.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from contextlib import asynccontextmanager
 
 import anyio