moat-kv-ow 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

moat/kv/ow/__init__.py

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

moat/kv/ow/_cfg.yaml

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

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/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/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/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.dist-info → moat_kv_ow-0.9.5.dist-info}/METADATA

@@ -1,21 +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
-Requires-Dist: moat-kv (~=0.70.2)
+License-File: LICENSE.txt
+Requires-Dist: moat-kv~=0.70.23
+Dynamic: license-file
 
 ==========
 MoaT-KV-OW

moat_kv_ow-0.9.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+moat/kv/ow/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
+moat/kv/ow/_cfg.yaml,sha256=dzidXt6m_1zw2fPaYGRjvV5aJ8rasBXeTXFpH1ZAMMk,40
+moat/kv/ow/_main.py,sha256=aoOHqJu5Y2vAcRm_xBbqqi6m7Svx1xniKKkD276g8fg,6469
+moat/kv/ow/mock.py,sha256=qBUiwOpeB096EXaBfT-yZ74Q9uzsAQ4_5nDgWMm64tM,1169
+moat/kv/ow/model.py,sha256=yQpnxtyjVuuRKkUSw8rLGlzQkfyy3jy6tvLLr9JwlYc,10407
+moat/kv/ow/task.py,sha256=tZjkFRhF4WjEHr_zZVy8eFabGOCWO_Cx2vMrn6Q6rGo,2686
+moat_kv_ow-0.9.5.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_kv_ow-0.9.5.dist-info/METADATA,sha256=X3IT-9KMjTTgSuSjOBWjGFczkgplwzwGcsZ1sUIsmFA,961
+moat_kv_ow-0.9.5.dist-info/WHEEL,sha256=xcaH6rP_nCxh1LBIPM7Q0uOnzSGjsIye-Q44j_zbzw8,104
+moat_kv_ow-0.9.5.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_kv_ow-0.9.5.dist-info/RECORD,,

{moat_kv_ow-0.9.3.dist-info → moat_kv_ow-0.9.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (77.0.3.post20250321)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

moat_kv_ow-0.9.5.dist-info/licenses/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/_config.yaml

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

moat_kv_ow-0.9.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-moat/kv/ow/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
-moat/kv/ow/_config.yaml,sha256=-F0QC6JyNBQX0X0sXzJrMsUu5s_Nzb3cYA9NzYL-gmI,58
-moat/kv/ow/_main.py,sha256=SEAbqVlTW8hSFKMUSphsQR-MeaJDd5dSz9pm__m4AWw,6405
-moat/kv/ow/mock.py,sha256=VxT1gxVi74qHe8-jfvzeY0oWcixNSY9zbLeybW-COFM,1009
-moat/kv/ow/model.py,sha256=4mCHjUwMldU7j2LjFBMooZBtArQ-OIu_jBcP9L__Arg,9959
-moat/kv/ow/task.py,sha256=K_wgmxw4Hqcc8dnRiupne8e2bAsBb3WHND8GBSacV1E,2612
-moat_kv_ow-0.9.3.dist-info/METADATA,sha256=FQvWmlVrq76MAPKEuku7dVaHr4VKJ1qJOXAM1Ws2bfU,1035
-moat_kv_ow-0.9.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-moat_kv_ow-0.9.3.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_kv_ow-0.9.3.dist-info/RECORD,,