boneIO 0.7.0.dev2__tar.gz → 0.7.0.dev3__tar.gz

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.7.0.dev2
+Version: 0.7.0.dev3
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/bonecli.py

@@ -15,6 +15,7 @@ from yaml import MarkedYAMLError
 from boneio.const import ACTION
 from boneio.helper import load_config_from_file
 from boneio.helper.exceptions import ConfigurationException, RestartRequestException
+from boneio.helper.events import GracefulExit
 from boneio.helper.logger import configure_logger
 from boneio.runner import async_run
 from boneio.version import __version__
@@ -89,8 +90,9 @@ def run(config: str, debug: int, mqttusername: str = "", mqttpassword: str = "")
             ),
         )
         return 0
-    except RestartRequestException as err:
-        _LOGGER.info(err)
+    except (RestartRequestException, GracefulExit) as err:
+        if err is not None:
+            _LOGGER.info(err)
         return 0
     except (ConfigurationException, MarkedYAMLError) as err:
         _LOGGER.error("Failed to load config. %s Exiting.", err)

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/helper/click_timer.py

@@ -24,9 +24,10 @@ class ClickTimer:
             self._remove_listener = None
 
     async def _start_async_timer(self) -> None:
+        start = time.time()
         await asyncio.sleep(self._delay)
         self._remove_listener = None
-        self._action(time.time())
+        self._action(round(time.time() - start, 2))
 
     def start_timer(self) -> None:
         """Start timer."""

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/helper/events.py

@@ -77,11 +77,9 @@ class ListenerJob:
 class EventBus:
     """Simple event bus which ticks every second."""
 
-    def __init__(self, last_will_mqtt = Callable) -> None:
+    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
         """Initialize handler"""
-        self._loop = asyncio.get_event_loop()
-        self._last_will = last_will_mqtt
-
+        self._loop = loop or asyncio.get_event_loop()
         self._listeners = {}
         self._sigterm_listeners = []
         self._haonline_listeners = []
@@ -89,7 +87,7 @@ class EventBus:
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
                 getattr(signal, signame),
-                lambda: asyncio.create_task(self.ask_exit()),
+                self.ask_exit,
             )
 
     def _run_second_event(self, time):
@@ -100,7 +98,7 @@ class EventBus:
                     self._loop.call_soon(listener.target, time)
                 )
 
-    async def ask_exit(self):
+    def ask_exit(self):
         """Function to call on exit. Should invoke all sigterm listeners."""
         _LOGGER.debug("Exiting process started.")
         self._listeners = {}
@@ -108,7 +106,6 @@ class EventBus:
             target()
         self._timer_handle()
 
-        await self._last_will()
         _LOGGER.info("Shutdown gracefully.")
         raise GracefulExit(code=0)
 

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/helper/gpio.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import asyncio
 import logging
 
@@ -104,7 +105,7 @@ class GpioBaseClass:
     """Base class for initialize GPIO"""
 
     def __init__(
-        self, pin: str, press_callback: Callable[[ClickTypes, str], None], **kwargs
+        self, pin: str, press_callback: Callable[[ClickTypes, str, bool | None], None], **kwargs
     ) -> None:
         """Setup GPIO Input Button"""
         self._pin = pin

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/helper/loader.py

@@ -7,7 +7,6 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Union
 
 from adafruit_mcp230xx.mcp23017 import MCP23017
 from adafruit_pca9685 import PCA9685
-from adafruit_pcf8575 import PCF8575
 
 from boneio.const import (
     ACTIONS,
@@ -64,6 +63,7 @@ from boneio.helper.onewire import (
 )
 from boneio.helper.ha_discovery import ha_cover_availabilty_message
 from boneio.helper.timeperiod import TimePeriod
+from boneio.helper.pcf8575 import PCF8575
 from boneio.input import GpioEventButton, GpioEventButtonBeta
 from boneio.sensor import DallasSensorDS2482, GpioInputBinarySensor, GpioInputBinarySensorBeta
 from boneio.sensor.temp.dallas import DallasSensorW1
@@ -74,7 +74,7 @@ if TYPE_CHECKING:
 
 from busio import I2C
 
-from boneio.relay import GpioRelay, MCPRelay, PWMPCA
+from boneio.relay import GpioRelay, MCPRelay, PWMPCA, PCFRelay
 from boneio.sensor import GpioADCSensor, initialize_adc
 
 _LOGGER = logging.getLogger(__name__)
@@ -153,12 +153,14 @@ def create_temp_sensor(
         _LOGGER.error("Can't configure Temp sensor. %s", err)
         pass
 
+
 expander_class = {
     MCP: MCP23017,
     PCA: PCA9685,
     PCF: PCF8575
 }
 
+
 def create_expander(
         expander_dict: dict,
         expander_config: list,
@@ -187,7 +189,6 @@ def create_expander(
     return grouped_outputs
 
 
-
 def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
     """Create Modbus sensor for each device."""
     from boneio.sensor.modbus import ModbusSensor
@@ -230,7 +231,7 @@ def output_chooser(output_kind: str, config):
         return OutputEntry(PWMPCA, PCA, output_id)
     elif output_kind == PCF:
         output_id = config.pop(PCF_ID, None)
-        return OutputEntry(PWMPCA, PCF, output_id)
+        return OutputEntry(PCFRelay, PCF, output_id)
     else:
         raise GPIOOutputException(f"""Output type {output_kind} dont exists""")
 
@@ -279,6 +280,17 @@ def configure_relay(
             "pca_id": getattr(output, "output_id"),
             "output_type": output_type,
         }
+    elif getattr(output, "output_kind") == PCF:
+        expander = manager.pcf.get(getattr(output, "output_id"))
+        if not expander:
+            _LOGGER.error("No such PCF configured!")
+            return None
+        kwargs = {
+            "pin": int(config.pop(PIN)),
+            "expander": expander,
+            "expander_id": getattr(output, "output_id"),
+            "output_type": output_type,
+        }
     elif getattr(output, "output_kind") == GPIO:
         if GPIO not in manager.grouped_outputs:
             manager.grouped_outputs[GPIO] = {}
@@ -337,12 +349,13 @@ def configure_event_sensor(
         GpioEventButtonClass = GpioEventButton if gpio.get("detection_type", "stable") == "stable" else GpioEventButtonBeta
         GpioEventButtonClass(
             pin=pin,
-            press_callback=lambda x, i: press_callback(
+            press_callback=lambda x, i, z: press_callback(
                 x=x,
                 inpin=i,
                 actions=gpio.get(ACTIONS, {}).get(x, []),
                 input_type=INPUT,
-                empty_message_after=gpio.get("clear_message", False)
+                empty_message_after=gpio.get("clear_message", False),
+                duration=z
             ),
             **gpio,
         )

boneIO-0.7.0.dev3/boneio/helper/pcf8575.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from adafruit_pcf8575 import PCF8575 as AdafruitPCF8575
+try:
+    from busio import I2C
+except ImportError:
+    pass
+
+
+class PCF8575(AdafruitPCF8575):
+
+    def __init__(self, i2c: I2C, address: int, reset: bool) -> None:
+        super().__init__(i2c_bus=i2c, address=address)

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/input/gpio_beta.py

@@ -19,6 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 DOUBLE_CLICK_DURATION_MS = 300
 LONG_PRESS_DURATION_MS = 600
 
+
 class GpioEventButtonBeta(GpioBaseClass):
     """Represent Gpio input switch."""
 
@@ -38,7 +39,7 @@ class GpioEventButtonBeta(GpioBaseClass):
         )
         self._timer_long = ClickTimer(
             delay=TimePeriod(milliseconds=LONG_PRESS_DURATION_MS),
-            action=lambda x: self.press_callback(click_type=LONG),
+            action=lambda x: self.press_callback(click_type=LONG, duration=x),
         )
         self._double_click_ran = False
         self._is_waiting_for_second_click = False
@@ -51,7 +52,7 @@ class GpioEventButtonBeta(GpioBaseClass):
     def double_click_press_callback(self):
         self._is_waiting_for_second_click = False
         if not self._state and not self._timer_long.is_waiting():
-            self.press_callback(click_type=SINGLE)
+            self.press_callback(click_type=SINGLE, duration=None)
 
     def check_state(self, channel) -> None:
         time_now = time.time()
@@ -64,7 +65,7 @@ class GpioEventButtonBeta(GpioBaseClass):
                 if self._timer_double.is_waiting():
                     self._timer_double.reset()
                     self._double_click_ran = True
-                    self.press_callback(click_type=DOUBLE)
+                    self.press_callback(click_type=DOUBLE, duration=None)
                     return
                 self._timer_double.start_timer()
                 self._is_waiting_for_second_click = True
@@ -72,13 +73,12 @@ class GpioEventButtonBeta(GpioBaseClass):
         else:
             if not self._is_waiting_for_second_click and not self._double_click_ran:
                 if self._timer_long.is_waiting():
-                    self.press_callback(click_type=SINGLE)
+                    self.press_callback(click_type=SINGLE, duration=None)
             self._timer_long.reset()
             self._double_click_ran = False
 
-
-    def press_callback(self, click_type: ClickTypes):
+    def press_callback(self, click_type: ClickTypes, duration: float | None = None):
         self.click_count = 0
         self._loop.call_soon_threadsafe(
-            partial(self._press_callback, click_type, self._pin)
+            partial(self._press_callback, click_type, self._pin, duration)
         )

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/manager.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import asyncio
 import logging
 from collections import deque
@@ -86,7 +87,6 @@ class Manager:
         stop_client: Callable[[], Awaitable[None]],
         state_manager: StateManager,
         config_helper: ConfigHelper,
-        event_bus: EventBus,
         config_file_path: str,
         relay_pins: List = [],
         event_pins: List = [],
@@ -111,7 +111,7 @@ class Manager:
         self._host_data = None
         self._config_file_path = config_file_path
         self._state_manager = state_manager
-        self._event_bus = event_bus
+        self._event_bus = EventBus(loop=self._loop)
 
         self.send_message = send_message
         self.stop_client = stop_client
@@ -145,21 +145,17 @@ class Manager:
         )
         self.grouped_outputs.update(
             create_expander(
-            expander_dict=self._pcf,
-            expander_config=pcf8575,
-            exp_type=PCF,
-            i2cbusio=self._i2cbusio
-        )
-        )
+                expander_dict=self._pcf,
+                expander_config=pcf8575,
+                exp_type=PCF,
+                i2cbusio=self._i2cbusio))
         self.grouped_outputs.update(
             create_expander(
-            expander_dict=self._pca,
-            expander_config=pca9685,
-            exp_type=PCA,
-            i2cbusio=self._i2cbusio
-        )
-        )
-
+                expander_dict=self._pca,
+                expander_config=pca9685,
+                exp_type=PCA,
+                i2cbusio=self._i2cbusio))
+        
         self._configure_adc(adc_list=adc)
 
         for _config in relay_pins:
@@ -484,12 +480,20 @@ class Manager:
         return self._pcf
 
     def press_callback(
-        self, x: ClickTypes, inpin: str, actions: List, input_type: InputTypes = INPUT, empty_message_after: bool = False
+        self, x: ClickTypes, inpin: str, actions: List, input_type: InputTypes = INPUT, empty_message_after: bool = False, duration: float | None = None
     ) -> None:
         """Press callback to use in input gpio.
         If relay input map is provided also toggle action on relay or cover or mqtt."""
         topic = f"{self._config_helper.topic_prefix}/{input_type}/{inpin}"
-        self.send_message(topic=topic, payload=x, retain=False)
+
+        def generate_payload():
+            if input_type == INPUT:
+                if duration:
+                    return {"event_type": x, "duration": duration}
+                return {"event_type": x}
+            return x
+            
+        self.send_message(topic=topic, payload=generate_payload(), retain=False)
         for action_definition in actions:
             _LOGGER.debug("Executing action %s", action_definition)
             if action_definition[ACTION] == OUTPUT:

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/mqtt_client.py

@@ -15,9 +15,10 @@ from aiomqtt import Client as AsyncioClient, MqttError, Will
 from paho.mqtt.properties import Properties
 from paho.mqtt.subscribeoptions import SubscribeOptions
 
-from boneio.const import ONLINE, OFFLINE, PAHO, STATE
+from boneio.const import OFFLINE, PAHO, STATE
 from boneio.helper import UniqueQueue
 from boneio.helper.config import ConfigHelper
+from boneio.helper.events import GracefulExit
 from boneio.manager import Manager
 from boneio.helper.exceptions import RestartRequestException
 
@@ -58,7 +59,7 @@ class MQTTClient:
             self.port,
             will=Will(
                 topic=f"{self._config_helper.topic_prefix}/{STATE}",
-                payload=ONLINE,
+                payload=OFFLINE,
                 qos=0,
                 retain=False,
             ),
@@ -148,21 +149,23 @@ class MQTTClient:
     async def start_client(self, manager: Manager) -> None:
         """Start the client with the manager."""
         # Reconnect automatically until the client is stopped.
-        while True:
-            try:
-                await self._subscribe_manager(manager)
-            except MqttError as err:
-                self.reconnect_interval = min(self.reconnect_interval * 2, 900)
-                _LOGGER.error(
-                    "MQTT error: %s. Reconnecting in %s seconds",
-                    err,
-                    self.reconnect_interval,
-                )
-                self._connection_established = False
-                await asyncio.sleep(self.reconnect_interval)
-                self.create_client()  # reset connect/reconnect futures
-            except asyncio.CancelledError:
-                _LOGGER.info("MQTT client task canceled.")
+        try:
+            while True:
+                try:
+                    await self._subscribe_manager(manager)
+                except MqttError as err:
+                    self.reconnect_interval = min(self.reconnect_interval * 2, 900)
+                    _LOGGER.error(
+                        "MQTT error: %s. Reconnecting in %s seconds",
+                        err,
+                        self.reconnect_interval,
+                    )
+                    self._connection_established = False
+                    await asyncio.sleep(self.reconnect_interval)
+                    self.create_client()  # reset connect/reconnect futures
+        except (asyncio.CancelledError, GracefulExit):
+            _LOGGER.info("MQTT client task canceled.")
+            pass
 
     async def stop_client(self) -> None:
         await self.unsubscribe(
@@ -170,11 +173,6 @@ class MQTTClient:
         )
         raise RestartRequestException("Restart requested.")
     
-    async def last_will_mqtt(self) -> None:
-        _LOGGER.info("Sending offline state.")
-        topic = f"{self._config_helper.topic_prefix}/{STATE}"
-        self.send_message(topic=topic, payload=OFFLINE, retain=True)
-
     async def _subscribe_manager(self, manager: Manager) -> None:
         """Connect and subscribe to manager topics + host stats."""
         async with AsyncExitStack() as stack:

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/relay/__init__.py

@@ -1,6 +1,7 @@
 """Relay module."""
 from boneio.relay.gpio import GpioRelay
 from boneio.relay.mcp import MCPRelay
+from boneio.relay.pcf import PCFRelay
 from boneio.relay.pca import PWMPCA
 
-__all__ = ["MCPRelay", "GpioRelay", "PWMPCA"]
+__all__ = ["MCPRelay", "GpioRelay", "PWMPCA", "PCFRelay"]

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/relay/pcf.py

@@ -2,10 +2,11 @@
 
 import logging
 
-from adafruit_pcf8575 import PCF8575, DigitalInOut
+from adafruit_pcf8575 import DigitalInOut
 
 from boneio.const import NONE, SWITCH, PCF
 from boneio.helper.events import async_track_point_in_time, utcnow
+from boneio.helper.pcf8575 import PCF8575
 from boneio.relay.basic import BasicRelay
 
 _LOGGER = logging.getLogger(__name__)
@@ -17,14 +18,14 @@ class PCFRelay(BasicRelay):
     def __init__(
         self,
         pin: int,
-        mcp: PCF8575,
+        expander: PCF8575,
         expander_id: str,
         output_type: str = SWITCH,
         restored_state: bool = False,
         **kwargs,
     ) -> None:
         """Initialize MCP relay."""
-        self._pin: DigitalInOut = mcp.get_pin(pin)
+        self._pin: DigitalInOut = expander.get_pin(pin)
         if output_type == NONE:
             """Just in case to not restore state of covers etc."""
             restored_state = False
@@ -34,6 +35,7 @@ class PCFRelay(BasicRelay):
         )
         self._pin_id = pin
         self._expander_id = expander_id
+        self._active_state = False
         _LOGGER.debug("Setup PCF with pin %s", self._pin_id)
 
     @property
@@ -54,7 +56,7 @@ class PCFRelay(BasicRelay):
     @property
     def is_active(self) -> bool:
         """Is relay active."""
-        return self.pin.value
+        return self.pin.value == self._active_state
 
     @property
     def pin(self) -> str:
@@ -63,7 +65,7 @@ class PCFRelay(BasicRelay):
 
     def turn_on(self) -> None:
         """Call turn on action."""
-        self.pin.value = True
+        self.pin.value = self._active_state
         if self._momentary_turn_on:
             async_track_point_in_time(
                 loop=self._loop,
@@ -74,7 +76,7 @@ class PCFRelay(BasicRelay):
 
     def turn_off(self) -> None:
         """Call turn off action."""
-        self.pin.value = False
+        self.pin.value = not self._active_state
         if self._momentary_turn_off:
             async_track_point_in_time(
                 loop=self._loop,

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/runner.py

@@ -59,8 +59,6 @@ async def async_run(
     mqttpassword: str = "",
 ) -> list[Any]:
     """Run BoneIO."""
-    _loop = asyncio.get_event_loop()
-
     _config_helper = ConfigHelper(
         topic_prefix=config[MQTT].pop(TOPIC_PREFIX),
         ha_discovery=config[MQTT][HA_DISCOVERY].pop(ENABLED),
@@ -74,7 +72,6 @@ async def async_run(
         port=config[MQTT].get(PORT, 1883),
         config_helper=_config_helper,
     )
-    event_bus =  EventBus(last_will_mqtt=client.last_will_mqtt)
     manager_kwargs = {
         item["name"]: config.get(item["name"], item["default"])
         for item in config_modules
@@ -83,7 +80,6 @@ async def async_run(
     manager = Manager(
         send_message=client.send_message,
         stop_client=client.stop_client,
-        event_bus=event_bus,
         relay_pins=config.get(OUTPUT, []),
         event_pins=config.get(EVENT_ENTITY, []),
         binary_pins=config.get(BINARY_SENSOR, []),
@@ -104,4 +100,4 @@ async def async_run(
     tasks.update(manager.get_tasks())
     _LOGGER.info("Connecting to MQTT.")
     tasks.add(client.start_client(manager))
-    return await asyncio.gather(*tasks)
+    return await asyncio.gather(*tasks, return_exceptions=True)

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/boneio/schema/schema.yaml

@@ -218,6 +218,33 @@ mcp23017:
         meta:
           label: How long to sleep for MCP to initialize.
 
+
+pcf8575:
+  type: list
+  required: False
+  meta:
+    label: pcf8575 Pin config
+  schema:
+    type: dict
+    schema:
+      id: !include id.yaml
+      address:
+        type: integer
+        required: True
+        meta:
+          label: GPIO of I2C SDA
+      init_sleep:
+        type:
+          - string
+          - timeperiod
+        coerce:
+          - str
+          - positive_time_period
+        required: True
+        default: 0s
+        meta:
+          label: How long to sleep for PCF to initialize.
+
 pca9685:
   type: list
   required: False
@@ -260,7 +287,7 @@ output:
           label: Id to send to use in HA and in GPIO Input. Default to `kind_pin`
       kind:
         type: string
-        allowed: ["gpio", "mcp", "pca"]
+        allowed: ["gpio", "mcp", "pca", "pcf"]
         meta:
           label: Either GPIO or i2c.
       mcp_id:
@@ -273,6 +300,11 @@ output:
         required: False
         meta:
           label: PCA ID to connect
+      pcf_id:
+        type: string
+        required: False
+        meta:
+          label: PCF ID to connect
       pin:
         type:
           - string

boneIO-0.7.0.dev3/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.7.0dev3"

{boneIO-0.7.0.dev2 → boneIO-0.7.0.dev3}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "adafruit-circuitpython-pcf8575>=1.0.2",
 ]
 requires-python = ">=3.7"
-version = "0.7.0.dev2"
+version = "0.7.0.dev3"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneIO-0.7.0.dev2/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.7.0dev2"