boneIO 0.1.0.dev6__py3-none-any.whl → 0.1.0.dev7__py3-none-any.whl

boneio/bonecli.py

@@ -1,6 +1,7 @@
 from .helper import CustomValidator, load_yaml_file
 import click
 import logging
+from contextlib import AsyncExitStack
 from colorlog import ColoredFormatter
 from .mqtt_client import MQTTClient
 from .manager import Manager
@@ -136,7 +137,10 @@ async def run(ctx, debug: int, config: str, mqttpassword: str = ""):
         mcp23017=_config[MCP23017],
         oled=_config.get(OLED),
     )
-    await client.start_client(manager)
+    tasks = set()
+    tasks.add(client.start_client(manager))
+    tasks.update(manager.get_tasks())
+    await asyncio.gather(*tasks)
 
 
 if __name__ == "__main__":

boneio/helper/stats.py

@@ -1,7 +1,19 @@
 import asyncio
 import psutil
 from math import floor
-from ..const import GIGABYTE, MEGABYTE, NETWORK, DISK, MEMORY, CPU, SWAP, UPTIME
+from ..const import (
+    GIGABYTE,
+    MEGABYTE,
+    NETWORK,
+    DISK,
+    MEMORY,
+    CPU,
+    SWAP,
+    UPTIME,
+    HOST,
+    OUTPUT,
+    OledDataTypes,
+)
 import time
 
 intervals = (
@@ -113,3 +125,38 @@ host_stats = {
     SWAP: get_swap_info,
     UPTIME: get_uptime,
 }
+
+import socket
+
+
+class HostData:
+    """Helper class to store host data."""
+
+    data = {UPTIME: {}, NETWORK: {}, CPU: {}, DISK: {}, MEMORY: {}, SWAP: {}}
+
+    def __init__(self, output: dict) -> None:
+        """Initialize HostData."""
+        self._hostname = socket.gethostname()
+        self.data[UPTIME] = {HOST: self._hostname, UPTIME: 0}
+        self._output = output
+
+    def write(self, type: str, data: dict) -> None:
+        """Write data of chosen type."""
+        self.data[type] = data
+
+    def write_uptime(self, uptime: str) -> None:
+        """Write uptime."""
+        self.data[UPTIME][UPTIME] = uptime
+
+    def get(self, type: OledDataTypes) -> dict:
+        """Get saved stats."""
+        if type == OUTPUT:
+            return self._get_output()
+        return self.data[type]
+
+    def _get_output(self) -> dict:
+        """Get stats for output."""
+        out = {}
+        for output in self._output.values():
+            out[output.id] = output.state
+        return out

boneio/manager.py

@@ -1,8 +1,14 @@
 from .input import GpioInputButton
 from .relay import GpioRelay, MCPRelay
 from .oled import Oled
+from .helper.stats import host_stats, HostData
+from typing import Set
+import asyncio
+import logging
+
 from .const import (
     ACTION,
+    OUTPUT,
     ACTIONS,
     ADDRESS,
     GPIO,
@@ -64,9 +70,11 @@ class Manager:
         ha_discovery_prefix: str = "homeassistant",
         mcp23017: Optional[List] = None,
         oled: bool = False,
+        web: bool = False,
     ) -> None:
         """Initialize the manager."""
         loop = asyncio.get_event_loop()
+        self._host_data = None
 
         self.send_message = send_message
         self._topic_prefix = topic_prefix
@@ -75,6 +83,7 @@ class Manager:
         self._i2cbusio = I2C(SCL, SDA)
         self._mcp = {}
         self._oled = None
+        self._tasks: List[asyncio.Task] = []
 
         if mcp23017:
             for mcp in mcp23017:
@@ -127,15 +136,19 @@ class Manager:
             for gpio in self._input_pins
         ]
 
+        if oled or web:
+            self._host_data = HostData(output=self.output)
+            for f in host_stats.values():
+                self._tasks.append(asyncio.create_task(f(self._host_data)))
+
         if oled:
-            self._oled = Oled(self.output)
+            self._oled = Oled(self._host_data)
+            self._tasks.append(self._oled.get_task())
 
         self.send_message(topic=f"{topic_prefix}/{STATE}", payload=ONLINE)
 
-    def get_oled_tasks(self) -> any:
-        if not self._oled:
-            return []
-        return self._oled.get_tasks()
+    def get_tasks(self) -> Set[asyncio.Task]:
+        return self._tasks
 
     def press_callback(self, x: ClickTypes, inpin: str, actions: dict) -> None:
         """Press callback to use in input gpio.

boneio/mqtt_client.py

@@ -144,7 +144,7 @@ class MQTTClient:
                 self.create_client()  # reset connect/reconnect futures
 
     async def _subscribe_manager(self, manager: any) -> None:
-        """Connect and subscribe to manager topics."""
+        """Connect and subscribe to manager topics + host stats."""
         async with AsyncExitStack() as stack:
             tasks: Set[asyncio.Task] = set()
 
@@ -166,8 +166,6 @@ class MQTTClient:
             )
             tasks.add(messages_task)
 
-            tasks.update(manager.get_oled_tasks())
-
             topic = f"{manager.relay_topic}"
             await self.subscribe(topic)
 

boneio/oled.py

@@ -1,5 +1,5 @@
 from .helper.gpio import setup_input, edge_detect
-from .helper.stats import host_stats
+from .helper.stats import HostData
 from .input.gpio import configure_pin
 from .const import (
     OLED_PIN,
@@ -10,17 +10,13 @@ from .const import (
     SWAP,
     NUM_OF_SCREENS,
     UPTIME,
-    HOST,
     OUTPUT,
     WHITE,
-    OledDataTypes,
 )
 import asyncio
 import os
-import socket
 import logging
 
-from functools import partial
 from luma.core.interface.serial import i2c
 from luma.core.render import canvas
 from luma.oled.device import sh1106
@@ -41,47 +37,14 @@ screen_order = [UPTIME, NETWORK, CPU, DISK, MEMORY, SWAP, OUTPUT]
 lines = [17, 32, 47]
 
 
-class HostData:
-    """Helper class to store host data."""
-
-    data = {UPTIME: {}, NETWORK: {}, CPU: {}, DISK: {}, MEMORY: {}, SWAP: {}}
-
-    def __init__(self, output: dict) -> None:
-        """Initialize HostData."""
-        self._hostname = socket.gethostname()
-        self.data[UPTIME] = {HOST: self._hostname, UPTIME: 0}
-        self._output = output
-
-    def write(self, type: str, data: dict) -> None:
-        """Write data of chosen type."""
-        self.data[type] = data
-
-    def write_uptime(self, uptime: str) -> None:
-        """Write uptime."""
-        self.data[UPTIME][UPTIME] = uptime
-
-    def get(self, type: OledDataTypes) -> dict:
-        """Get saved stats."""
-        if type == OUTPUT:
-            return self._get_output()
-        return self.data[type]
-
-    def _get_output(self) -> dict:
-        """Get stats for output."""
-        out = {}
-        for output in self._output.values():
-            out[output.id] = output.state
-        return out
-
-
 class Oled:
     """Oled display class."""
 
-    def __init__(self, output: dict) -> None:
+    def __init__(self, host_data: HostData) -> None:
         """Initialize OLED screen."""
         self._screen_no = 0
         self._loop = asyncio.get_running_loop()
-        self._host_data = HostData(output=output)
+        self._host_data = host_data
         configure_pin(OLED_PIN)
         setup_input(OLED_PIN)
         edge_detect(OLED_PIN, callback=self._handle_press, bounce=50)
@@ -89,31 +52,30 @@ class Oled:
         self._device = sh1106(serial)
         _LOGGER.debug("Configuring OLED screen.")
 
-    def get_tasks(self) -> list:
+    def get_task(self) -> list:
         """Periodically check for host statistics."""
-        return [
-            asyncio.create_task(func(self._host_data)) for func in host_stats.values()
-        ]
-
-    def _handle_press(self, pin: any) -> None:
-        """Handle press of PIN for OLED display."""
+        return asyncio.create_task(self.render_display())
 
-        def press_callback(screen_no):
-            screen = screen_order[screen_no]
+    async def render_display(self):
+        while True:
+            screen = screen_order[self._screen_no]
             data = self._host_data.get(screen)
-            with canvas(self._device) as draw:
-                draw.text((1, 1), screen, font=fontBig, fill=WHITE)
-                i = 0
-                for k in data:
-                    draw.text(
-                        (3, lines[i]),
-                        f"{k} {data[k]}",
-                        font=fontSmall,
-                        fill=WHITE,
-                    )
-                    i += 1
+            if data:
+                with canvas(self._device) as draw:
+                    draw.text((1, 1), screen, font=fontBig, fill=WHITE)
+                    i = 0
+                    for k in data:
+                        draw.text(
+                            (3, lines[i]),
+                            f"{k} {data[k]}",
+                            font=fontSmall,
+                            fill=WHITE,
+                        )
+                        i += 1
+            await asyncio.sleep(0.5)
 
-        self._loop.call_soon_threadsafe(partial(press_callback, self._screen_no))
+    def _handle_press(self, pin: any) -> None:
+        """Handle press of PIN for OLED display."""
         if self._screen_no < NUM_OF_SCREENS:
             self._screen_no += 1
         else:

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.1.0.dev6"
+__version__ = "0.1.0.dev7"

{boneio-0.1.0.dev6.dist-info → boneio-0.1.0.dev7.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.1.0.dev6
+Version: 0.1.0.dev7
 Summary: Python Helper for BoneIO
 Home-page: https://github.com/maciejk1984/boneIO
 License: GNU General Public License v3.0
-Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev6.zip
+Download-URL: https://github.com/maciejk1984/boneIO/archive/0.1.0.dev7.zip
 Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7

{boneio-0.1.0.dev6.dist-info → boneio-0.1.0.dev7.dist-info}/RECORD

@@ -1,16 +1,16 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
-boneio/bonecli.py,sha256=kCxGZzsZNUkJuTbhRurtC0JWs5rUla9m6tFmi9shWTI,3563
+boneio/bonecli.py,sha256=SE62MXAle38I_mCpGT8j-0_EfOzYqOshQTSDZ5-NpfU,3695
 boneio/config.example.yaml,sha256=WAoyi8jg5zLvlDaoDBPEu_XkHq_zB4mDj9Dxbg0-V4A,465
 boneio/config.yaml,sha256=4YEdjJIh0u_689YnLPAxNlH--a9TqWsaGd8o4-gMABU,254
 boneio/const.py,sha256=fZXr-SyuSUTXxps0E_DX7ZKpH7ksSn6P-3SoYFJExMU,1165
-boneio/manager.py,sha256=hWEmJ4okoKog5alrLaeo9ANLPPH6zdpGqTAJSSUREKI,5494
-boneio/mqtt_client.py,sha256=KXkXZiPZjq-s2shOs2wObIpC1TFojS_zC7mJ7dBI_7o,6348
-boneio/oled.py,sha256=0ZeQfeXw1EH_ZhMedy7IXgdbgs6cklLAS942vKhVVzQ,3446
+boneio/manager.py,sha256=Erm5-38g1P1lR3mvJS9WF5g_3pdbcsby9Ah_xpAbb8k,5919
+boneio/mqtt_client.py,sha256=o3lTuM9eOfqIs1yaxFmx1NFTU3nvwqWFR7A7VjpZ0fo,6309
+boneio/oled.py,sha256=g9MVsH1uRGJALRz38VtT00q75Qws5kwUdeSmiiaC6es,2372
 boneio/schema.yaml,sha256=A3oEFx8R9T34OGS6gfFByk_UEffOGduOeFEF1VLni_0,3617
-boneio/version.py,sha256=daBxh9WgiCxCnwvyU2UupN9Pyjra4Le4X2fmTLvfmE0,42
+boneio/version.py,sha256=luFPZpokGu-BWg1TYdSkx2eQYB7fDJC2R90J49cJ_cU,42
 boneio/helper/__init__.py,sha256=AXk0Qciu1nqt4rWdMDinKLJX701SFBYzWOnXrZHh-UQ,128
 boneio/helper/gpio.py,sha256=7TEknDFdLqjiPhs3g7zDS1R5kjFV2Ns8TNFFJzbx6hY,770
-boneio/helper/stats.py,sha256=7yCnN9bklibK2jnN8hD5c-mhRIFqPQZjIqIC-I7PMiE,2894
+boneio/helper/stats.py,sha256=2X17r8-d3pHNwhlRihnfJtpLKvLv-80nISSFnz5sf0g,3964
 boneio/helper/yaml.py,sha256=_KXXbnDV5btqVw7e9Vd7NVq7FOvPhPDWYssevBc_UVg,1224
 boneio/input/__init__.py,sha256=h8mkcengWWmT8wYb8ZbVtbrKZFQvHWOKB6Q8eOeDxAo,87
 boneio/input/gpio.py,sha256=rRlIdfUePk2Q5N6mNO-mA0thCdFuodsZ27qEiGPNROo,4853
@@ -18,8 +18,8 @@ boneio/relay/__init__.py,sha256=iVRXyXh9qvs1ooQ0fzFJC6muiNHwWqkJTu0ajFm9nTo,111
 boneio/relay/basic.py,sha256=mDeyYnaiVZhny3aimXG5a2vCKu0WaMSI-okjR7pM2d4,1725
 boneio/relay/gpio.py,sha256=ys_7S0S9lSmGpHCwNeS7ac99jgNUCNbfRgcTFKfXrFw,1128
 boneio/relay/mcp.py,sha256=RQtMPM0JKpEdMI8oXR5DCavDFrSUNIA_duNXWMJRO2A,1187
-boneio-0.1.0.dev6.dist-info/METADATA,sha256=luhOXOs6E5SVPgKcJ1t1y-PMMYwjrf0AJGxEduB2-pY,1280
-boneio-0.1.0.dev6.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-boneio-0.1.0.dev6.dist-info/entry_points.txt,sha256=5SCe5w4eZDOqZwKjMf7UjHzjCI0u2Dcbs0ebrPex5_k,47
-boneio-0.1.0.dev6.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
-boneio-0.1.0.dev6.dist-info/RECORD,,
+boneio-0.1.0.dev7.dist-info/METADATA,sha256=GrUrbffYdSBnwkp3U94bWE7DK5PxO4YULHUJfs-PS9A,1280
+boneio-0.1.0.dev7.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+boneio-0.1.0.dev7.dist-info/entry_points.txt,sha256=5SCe5w4eZDOqZwKjMf7UjHzjCI0u2Dcbs0ebrPex5_k,47
+boneio-0.1.0.dev7.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
+boneio-0.1.0.dev7.dist-info/RECORD,,