moat-kv-ow 0.9.3__tar.gz → 0.9.5__tar.gz

moat_kv_ow-0.9.5/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-ow-0.9.3/moat_kv_ow.egg-info → moat_kv_ow-0.9.5}/PKG-INFO

@@ -1,20 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moat-kv-ow
-Version: 0.9.3
+Version: 0.9.5
 Summary: 1wire connector for MoaT-KV
 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-ow
+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: Programming Language :: Python :: 3
 Classifier: Topic :: Database
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: moat-kv~=0.70.23
+Dynamic: license-file
 
 ==========
 MoaT-KV-OW

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat/kv/ow/__init__.py

@@ -1 +1,3 @@
+from __future__ import annotations
+
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)

moat_kv_ow-0.9.5/moat/kv/ow/_cfg.yaml

@@ -0,0 +1,2 @@
+prefix: !P :.moat.kv.onewire
+port: 4304

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat/kv/ow/_main.py

@@ -1,7 +1,17 @@
 # command line interface
+from __future__ import annotations
 
 import asyncclick as click
-from moat.util import yprint, attrdict, NotGiven, P, Path, as_service, attr_args
+from moat.util import (
+    yprint,
+    attrdict,
+    NotGiven,
+    P,
+    Path,
+    as_service,
+    attr_args,
+    ensure_cfg,
+)
 from moat.kv.data import data_get, node_attr
 from .model import OWFSroot
 
@@ -17,6 +27,7 @@ async def cli(obj):
     List Onewire devices, modify device handling …
     """
     obj.data = await OWFSroot.as_handler(obj.client)
+    ensure_cfg("moat.kv.ow", obj.cfg)
 
 
 @cli.command("list")
@@ -59,6 +70,7 @@ async def list_(obj, device, family):
                 return Path("%02x.%12x" % (p[0], p[1])) + p[2:]
 
     if obj.meta:
+
         def pm(p):
             return Path(str(prefix + path)) + p
 
@@ -127,7 +139,7 @@ async def attr__(obj, device, family, write, attr, interval, path, attr_):
 @attr_args
 @click.argument("subpath", nargs=1, type=P, default=P(":"))
 @click.pass_obj
-async def set_(obj, device, family, subpath, vars_, eval_, path_):
+async def set_(obj, device, family, subpath, **kw):
     """Set or delete some random attribute.
 
     For deletion, use '-e ATTR -'.
@@ -143,7 +155,7 @@ async def set_(obj, device, family, subpath, vars_, eval_, path_):
         f, d = device.split(".", 2)[0:2]
         fd = (int(f, 16), int(d, 16))
 
-    res = await node_attr(obj, obj.cfg.kv.ow.prefix + fd + subpath, vars_, eval_, path_)
+    res = await node_attr(obj, obj.cfg.kv.ow.prefix + fd + subpath, **kw)
     if res and obj.meta:
         yprint(res, stream=obj.stdout)
 
@@ -164,9 +176,7 @@ async def server_(obj, name, host, port, delete):
     if not name:
         if host or port or delete:
             raise click.UsageError("Use a server name to set parameters")
-        async for r in obj.client.get_tree(
-            prefix | "server", min_depth=1, max_depth=1
-        ):
+        async for r in obj.client.get_tree(prefix | "server", min_depth=1, max_depth=1):
             print(r.path[-1], file=obj.stdout)
         return
     elif len(name) > 1:
@@ -190,8 +200,7 @@ async def server_(obj, name, host, port, delete):
         return
     else:
         value = None
-    res = await node_attr(
-        obj, prefix | "server" | name, ((P("server"), value),),(),())
+    res = await node_attr(obj, prefix | "server" | name, ((P("server"), value),), (), ())
     if res and obj.meta:
         yprint(res, stream=obj.stdout)
 

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat/kv/ow/mock.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
 import os
 import anyio
 from functools import partial
 from asyncowfs.mock import some_server
+from moat.util import ensure_cfg
 
 from .task import task
 
@@ -9,10 +11,11 @@ PORT = ((os.getpid() + 101) % 9999) + 40000
 
 
 async def server(client, tree={}, options={}, evt=None):  # pylint: disable=dangerous-default-value
-
     async with anyio.create_task_group() as tg:
         listener = await anyio.create_tcp_listener(
-            local_host="127.0.0.1", local_port=PORT, reuse_port=True
+            local_host="127.0.0.1",
+            local_port=PORT,
+            reuse_port=True,
         )
 
         async def may_close():
@@ -24,8 +27,11 @@ async def server(client, tree={}, options={}, evt=None):  # pylint: disable=dang
         addr = listener.extra(anyio.abc.SocketAttribute.raw_socket).getsockname()
         tg.start_soon(may_close)
 
+        cfg = {"kv": client._cfg}
+        ensure_cfg("moat.kv.ow", cfg)
+
         await client.set(
-            client._cfg.kv.owfs.prefix + ("server", "127.0.0.1"),
+            client._cfg.ow.prefix + ("server", "127.0.0.1"),
             value=dict(server=dict(host="127.0.0.1", port=addr[1])),
         )
 

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat/kv/ow/model.py

@@ -1,6 +1,9 @@
 """
 Moat-KV client data model for 1wire
 """
+
+from __future__ import annotations
+
 import anyio
 
 from moat.util import combine_dict, attrdict
@@ -60,14 +63,16 @@ class OWFSattr(ClientEntry):
         src_attr = val.get("src_attr", ())
         if force or src != self.watch_src:
             if self.watch_src_scope is not None:
-                await self.watch_src_scope.cancel()
+                self.watch_src_scope.cancel()
             self.watch_src = src
             self.watch_src_attr = src_attr
             if src is not None:
                 await self.root._tg.start(self._watch_src)
             else:
                 await self.root.err.record_working(
-                    "owfs", self.subpath + ("write",), comment="dropped"
+                    "owfs",
+                    self.subpath + ("write",),
+                    comment="dropped",
                 )
 
         # poll OWFS
@@ -88,7 +93,9 @@ class OWFSattr(ClientEntry):
                     await dev.set_polling_interval(self.attr, intv)
                 else:
                     await self.root.err.record_working(
-                        "owfs", self.subpath + ("read",), comment="dropped"
+                        "owfs",
+                        self.subpath + ("read",),
+                        comment="dropped",
                     )
             except RuntimeError as exc:
                 await self.root.err.record_error("owfs", self.subpath + ("read",), exc=exc)
@@ -133,13 +140,16 @@ class OWFSattr(ClientEntry):
         Task that monitors one entry and writes its value to the 1wire
         device.
         """
-        async with anyio.open_cancel_scope() as sc:
+        with anyio.CancelScope() as sc:
             try:
                 async with self.client.watch(
-                    self.watch_src, min_depth=0, max_depth=0, fetch=True
+                    self.watch_src,
+                    min_depth=0,
+                    max_depth=0,
+                    fetch=True,
                 ) as wp:
                     if self.watch_src_scope is not None:
-                        await self.watch_src_scope.cancel()
+                        self.watch_src_scope.cancel()
                     self.watch_src_scope = sc
                     task_status.started()
 
@@ -157,19 +167,27 @@ class OWFSattr(ClientEntry):
                                 "owfs",
                                 self.subpath + ("write",),
                                 comment="Attribute missing",
-                                data={"key": k, "attr": self.watch_src_attr, "msg": msg},
+                                data={
+                                    "key": k,
+                                    "attr": self.watch_src_attr,
+                                    "msg": msg,
+                                },
                             )
                             return
                         else:
                             dev = self.node.dev
                             if dev is None:
                                 await self.root.err.record_error(
-                                    "owfs", self.subpath + ("write",), comment="device missing"
+                                    "owfs",
+                                    self.subpath + ("write",),
+                                    comment="device missing",
                                 )
                                 return
                             await dev.set(*self.attr, value=val)
                             await self.root.err.record_working(
-                                "owfs", self.subpath + ("write",), comment="write OK"
+                                "owfs",
+                                self.subpath + ("write",),
+                                comment="write OK",
                             )
 
             except Exception as exc:
@@ -237,7 +255,7 @@ class OWFSfamily(ClientEntry):
     def child_type(cls, name):
         if not isinstance(name, int):
             return ClientEntry
-        if name <= 0 or name > 16 ** 12:
+        if name <= 0 or name > 16**12:
             return ClientEntry
         return cls.cls
 
@@ -301,15 +319,18 @@ class OWFSroot(ClientRoot):
             kls.cls[name] = FamilyX
             return FamilyX
 
+
 class BrokenDict:
     def __getattr__(self, k, v=None):
-        import pdb;pdb.set_trace()
-        return object.__getattribute__(self,k,v)
-    pass
+        import pdb
+
+        pdb.set_trace()
+        return object.__getattribute__(self, k, v)
+
 
 @OWFSroot.register(0x10)
 class TempNode(OWFSnode):
-    CFG = BrokenDict() # {"temperature": 30}
+    CFG = BrokenDict()  # {"temperature": 30}
 
     @classmethod
     def child_type(cls, name):

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat/kv/ow/task.py

@@ -2,6 +2,8 @@
 OWFS task for DistKV
 """
 
+from __future__ import annotations
+
 import anyio
 from asyncowfs import OWFS
 from asyncowfs.event import (
@@ -51,7 +53,9 @@ async def mon(ow, hd):
                 if isinstance(msg.attribute, str):
                     attr = (attr,)
                 await node.root.err.record_error(
-                    "onewire", Path.build(node.subpath) + attr, exc=msg.exception
+                    "onewire",
+                    Path.build(node.subpath) + attr,
+                    exc=msg.exception,
                 )
 
             elif isinstance(msg, DeviceValue):
@@ -70,7 +74,7 @@ async def task(client, cfg, server=None, evt=None):
     async with OWFS() as ow:
         hd = await OWFSroot.as_handler(client)
         await ow.add_task(mon, ow, hd)
-        port = cfg.kv.ow.port
+        port = cfg.ow.port
         if not server:
             si = ((s._name, s) for s in hd.server)
         elif isinstance(server, str):

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5/moat_kv_ow.egg-info}/PKG-INFO

@@ -1,20 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: moat-kv-ow
-Version: 0.9.3
+Version: 0.9.5
 Summary: 1wire connector for MoaT-KV
 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-ow
+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: Programming Language :: Python :: 3
 Classifier: Topic :: Database
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: moat-kv~=0.70.23
+Dynamic: license-file
 
 ==========
 MoaT-KV-OW

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/moat_kv_ow.egg-info/SOURCES.txt

@@ -1,14 +1,9 @@
-.gitignore
-.pylintrc
-Makefile
+LICENSE.txt
 README.rst
-TODO.rst
-USAGE.rst
-moat-kv-ow@.service
 pyproject.toml
 setup.cfg
 moat/kv/ow/__init__.py
-moat/kv/ow/_config.yaml
+moat/kv/ow/_cfg.yaml
 moat/kv/ow/_main.py
 moat/kv/ow/mock.py
 moat/kv/ow/model.py
@@ -17,8 +12,4 @@ moat_kv_ow.egg-info/PKG-INFO
 moat_kv_ow.egg-info/SOURCES.txt
 moat_kv_ow.egg-info/dependency_links.txt
 moat_kv_ow.egg-info/requires.txt
-moat_kv_ow.egg-info/top_level.txt
-tests/__init__.py
-tests/conftest.py
-tests/test_alarm.py
-tools/update-0-4.py
+moat_kv_ow.egg-info/top_level.txt

moat_kv_ow-0.9.5/moat_kv_ow.egg-info/requires.txt

@@ -0,0 +1 @@
+moat-kv~=0.70.23

{moat-kv-ow-0.9.3 → moat_kv_ow-0.9.5}/pyproject.toml

@@ -1,36 +1,33 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = [ "setuptools", "wheel", "setuptools-scm",]
+requires = [ "setuptools", "wheel",]
 
 [project]
 classifiers = [
 	"Development Status :: 4 - Beta",
 	"Intended Audience :: Information Technology",
-	"License :: OSI Approved :: MIT License",
-	"License :: OSI Approved :: Apache Software License",
 	"Programming Language :: Python :: 3",
 	"Topic :: Database",                                                                            
 	"Topic :: Home Automation",
 ]
 dependencies = [
-	"moat-kv ~= 0.70.2",
+	"moat-kv ~= 0.70.23",
 ]
-dynamic = [ "version",]
+version = "0.9.5"
 keywords = [ "MoaT",]
 requires-python = ">=3.8"
 name = "moat-kv-ow"
 description = "1wire connector for MoaT-KV"
 readme = "README.rst"
+license-files = ["LICENSE.txt"]
+
 [[project.authors]]
 email = "matthias@urlichs.de"
 name = "Matthias Urlichs"
 
-[project.license]
-file = "LICENSE"
-
 [project.urls]
 homepage = "https://m-o-a-t.org"
-repository = "https://github.com/M-o-a-T/moat-kv-ow"
+repository = "https://github.com/M-o-a-T/moat"
 
 [tool.flake8]
 max-line-length = 99

moat-kv-ow-0.9.3/.gitignore

@@ -1,8 +0,0 @@
-/.hypothesis/
-/.pybuild/
-/dist/
-__pycache__
-/*.egg-info/
-/.eggs/
-/build/
-/debian/

moat-kv-ow-0.9.3/.pylintrc

@@ -1,3 +0,0 @@
-[MESSAGES CONTROL]
-disable=bad-continuation,invalid-name,unnecessary-pass,protected-access,fixme,broad-except,no-absolute-import,global-statement,C,R
-

moat-kv-ow-0.9.3/Makefile

@@ -1,14 +0,0 @@
-#!/usr/bin/make -f
-
-PACKAGE = moat-kv-ow
-MAKEINCL ?= $(shell python3 -mmoat src path)/make/py
-
-ifneq ($(wildcard $(MAKEINCL)),)
-include $(MAKEINCL)
-# availabe via https://github.com/moat-src
-
-else
-%:
-	@echo "Please fix 'python3 -mmoat src path'."
-	@exit 1
-endif

moat-kv-ow-0.9.3/TODO.rst

@@ -1,5 +0,0 @@
-* document basic usage
-
-* document command line
-
-* add code to filter setters (e.g. delta filter, to avoid sensor noise)

moat-kv-ow-0.9.3/USAGE.rst

@@ -1,100 +0,0 @@
-==============
-Using DistOWFS
-==============
-
-Run "moat kw ow monitor" to connect to the server on localhost.
-
-See "moat dump cfg owfs" for configuration options. Specifically, use
-this config snippet to connect to two external servers instead of localhost::
-
-   owfs:
-     server:
-       - host: one.example
-       - host: two.example
-
-
-Command line
-============
-
-
-.. program:: moat kw ow
-
-The main entry point for this extension.
-
-
-.. program:: moat kw ow list
-
-Print the current state of your 1wire devices.
-
-This command does not access the device or show on which bus it is; this is 
-solely for displaying the configuration of its interaction with DistKV.
-
-.. option:: family
-
-   You can limit the display to a family code.
-
-.. option:: device
-
-   If you add the device ID, only that devices data is displayed.
-
-   Use '-' to show the data stored at the family entry.
-
-
-.. program:: moat kw ow monitor
-
-This is a stand-alone 1wire monitor. It connects to all configured servers
-and runs polls and monitors.
-
-No options yet.
-
-
-.. program:: moat kw ow poll
-
-Configure polling.
-
-If the device (and the given attribute) supports simultaneous conversion,
-this might cause results to be read more often than configured here.
-
-.. option:: -f, --family <code>
-
-   Change the poll interval's default for this family code.
-
-.. option:: -d, --device <family.device>
-
-   Change the poll interval for this device.
-
-.. option:: <attribute>
-
-   Set the interval on this attribute. Use a ``/`` separator for sub-attributes.
-
-.. option:: <interval>
-
-   The interval to poll at. Use ``-`` to disable polling.
-
-
-.. program:: moat kw ow set
-
-You can use this command to add arbitrary values to a device's entry. Use
-this e.g. to add a note where the device is located, or to signal your own
-code.
-
-.. option:: -f, --family <code>
-
-   Change an attribute on this family code.
-
-.. option:: -d, --device <family.device>
-
-   Change an attribute on this device.
-
-.. option:: -v, --value
-
-   The value to set.
-
-.. option:: -e, --eval
-
-   Flag that the value is a Python expression and should be evaluated.
-
-.. option:: <name>…
-
-   The attribute name to set. Use more than once for accessing sub-dicts.
-

moat-kv-ow-0.9.3/moat/kv/ow/_config.yaml

@@ -1,4 +0,0 @@
-kv:
-  ow:
-    prefix: !P :.moat.kv.onewire
-    port: 4304

moat-kv-ow-0.9.3/moat-kv-ow@.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Moat-KV OWFS server
-After=moat-kv.service
-Requires=moat-kv.service
-
-ConditionFileNotEmpty=/etc/moat/moat.cfg
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-Type=notify
-ExecStart=/usr/bin/moat kv ow monitor %I
-
-TimeoutSec=300
-WatchdogSec=10
-
-Restart=always
-RestartSec=30

moat-kv-ow-0.9.3/moat_kv_ow.egg-info/requires.txt

@@ -1 +0,0 @@
-moat-kv~=0.70.2

moat-kv-ow-0.9.3/tests/conftest.py

@@ -1,5 +0,0 @@
-from pytest_trio.enable_trio_mode import *  # pylint:disable=wildcard-import,unused-wildcard-import
-
-import logging
-
-logging.basicConfig(level=logging.DEBUG)

moat-kv-ow-0.9.3/tests/test_alarm.py

@@ -1,75 +0,0 @@
-"""
-Test program cloned from asyncowfs, but using MoaT-KV for end-to-semi-end testing.
-"""
-import sys
-import anyio
-from copy import deepcopy
-from functools import partial
-
-from asyncowfs.mock import structs
-from moat.kv.mock.mqtt import stdtest
-
-from moat.util import attrdict, Path, P, load_ext
-from moat.kv.data import data_get
-
-owfs_mock = load_ext("moat.kv.ow.mock")
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-# We can just use 'async def test_*' to define async tests.
-# This also uses a virtual clock fixture, so time passes quickly and
-# predictably.
-
-basic_tree = {
-    "bus.0": {
-        "alarm": {},
-        "simultaneous": {"temperature": 0},
-        "10.345678.90": {
-            "latesttemp": "12.5",
-            "temperature": "12.5",
-            "templow": "15",
-            "temphigh": "20",
-            "foo": {"bar": 123, "plugh.A": 1, "plugh.B": 2, "plugh.C": 3},
-        },
-    },
-    "structure": structs,
-}
-
-
-async def test_alarm(mock_clock):
-    mock_clock.autojump_threshold = 0.1
-    my_tree = deepcopy(basic_tree)
-    dt = my_tree["bus.0"]["10.345678.90"]
-    async with stdtest(test_0={"init": 125}, n=1, tocks=200) as st, st.client(0) as client:
-        evt = anyio.Event()
-        obj = attrdict(client=client, meta=0, stdout=sys.stdout)
-        st.tg.start_soon(partial(owfs_mock.server, client, tree=my_tree, evt=evt))
-        await evt.wait()
-        assert dt["foo"]["bar"] == 123
-        await st.run("owfs attr -d 10.345678.90 -i 5 temperature test.foo.temp")
-        await st.run("owfs attr -d 10.345678.90 -w templow test.foo.low")
-        await st.run("owfs attr -d 10.345678.90 -w foo.bar -a bar:1 test.foo.what.ever")
-        await st.run("owfs attr -d 10.345678.90 -i 4 -a baz:2 foo.plugh:1 test.foo.this")
-        res = await client.set(P("test.foo.this"), value={"this": "is", "baz": {3: 33}})
-        await anyio.sleep(10)
-        await data_get(obj, Path())
-
-        await client.set(P("test.foo.low"), 11)
-        await client.set(P("test.foo.what.ever"), {"Hello": "No", "bar": {0: 99, 1: 13}})
-        await anyio.sleep(1)
-        res = await client.get(P("test.foo.temp"))
-        assert res.value == 12.5
-        dt["latesttemp"] = 42
-        dt["temperature"] = 42
-        dt["foo"]["plugh.B"] = 22
-        await anyio.sleep(6)
-        res = await client.get(P("test.foo.temp"))
-        await data_get(obj, Path())
-        assert res.value == 42
-        assert dt["foo"]["bar"] == "13"
-        res = await client.get(P("test.foo.this"))
-        assert res.value == {"this": "is", "baz": {2: 22, 3: 33}}
-
-        await st.tg.cancel_scope.cancel()

moat-kv-ow-0.9.3/tools/update-0-4.py

@@ -1,20 +0,0 @@
-#!/usr/bin/python3
-
-import anyio
-from moat.util import P
-from moat.kv.client import open_client
-
-async def mod_owfs():
-    async with open_client() as c:
-        async for r in c.get_tree(P(":.distkv.onewire"),min_depth=2,max_depth=2,nchain=2):
-            try:
-                at = r.value.pop("attr")
-            except KeyError:
-                continue
-            await c.set(P(":.distkv.onewire")+r.path,value=r.value,chain=r.chain)
-#           for k,v in at.items():
-#               print(r.path+P(k.replace('/',':')),v)
-#               await c.set(P(":.distkv.onewire")+r.path+P(k.replace('/',':')),value=v)
-
-anyio.run(mod_owfs)
-