boneIO 0.10.1__tar.gz → 0.10.1.dev1__tar.gz

{boneio-0.10.1 → boneio-0.10.1.dev1}/PKG-INFO

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

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/cover.py

@@ -127,7 +127,13 @@ class Cover(BasicMqtt):
         """Current state of cover."""
         return CLOSED if self._closed else OPEN
 
-    async def stop(self) -> None:
+    def stop(self) -> None:
+        """Public Stop cover graceful."""
+        _LOGGER.info("Stopping cover %s.", self._id)
+        if self._current_operation != IDLE:
+            self._stop_cover(on_exit=False)
+
+    async def async_stop(self) -> None:
         """Public Stop cover graceful."""
         _LOGGER.info("Stopping cover %s.", self._id)
         if self._current_operation != IDLE:
@@ -285,14 +291,14 @@ class Cover(BasicMqtt):
     async def toggle_open(self) -> None:
         _LOGGER.debug("Toggle open cover %s from input.", self._id)
         if self._current_operation != IDLE:
-            await self.stop()
+            await self.async_stop()
         else:
             await self.open()
 
     async def toggle_close(self) -> None:
         _LOGGER.debug("Toggle close cover %s from input.", self._id)
         if self._current_operation != IDLE:
-            await self.stop()
+            await self.async_stop()
         else:
             await self.close()
 

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/helper/config.py

@@ -24,7 +24,6 @@ class ConfigHelper:
         self,
         topic_prefix: str,
         name: str = BONEIO,
-        device_type: str = "boneIO Black",
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
     ):
@@ -32,7 +31,6 @@ class ConfigHelper:
         self._topic_prefix = topic_prefix if topic_prefix else name
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
-        self._device_type = device_type
         self._fetch_old_discovery = None
         self._autodiscovery_messages = {
             SWITCH: {},
@@ -61,10 +59,6 @@ class ConfigHelper:
     def ha_discovery_prefix(self) -> str:
         return self._ha_discovery_prefix
 
-    @property
-    def device_type(self) -> str:
-        return self._device_type
-
     @property
     def cmd_topic_prefix(self) -> str:
         return f"{self.topic_prefix}/cmd/"

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/helper/ha_discovery.py

@@ -55,7 +55,7 @@ def ha_light_availabilty_message(id: str, topic: str = "boneIO", device_type: st
     return msg
 
 
-def ha_led_availabilty_message(id: str, topic: str = "boneIO",  **kwargs):
+def ha_led_availabilty_message(id: str, topic: str = "boneIO", **kwargs):
     """Create LED availability topic for HA."""
     msg = ha_availabilty_message(device_type=RELAY, topic=topic, id=id, **kwargs)
     msg["command_topic"] = f"{topic}/cmd/{RELAY}/{id}/set"
@@ -110,7 +110,7 @@ def ha_sensor_availabilty_message(unit_of_measurement: str = None, **kwargs):
         return msg
 
 
-def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board"):
+def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str, topic: str = "boneIO"):
     """Create availability topic for HA."""
     kwargs = {"device_class": device_class} if device_class else {}
     return {
@@ -119,7 +119,7 @@ def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str,
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": model,
+            "model": "boneIO Relay Board",
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -132,7 +132,7 @@ def ha_binary_sensor_availabilty_message(id: str, name: str, device_class: str,
 
 
 def ha_sensor_ina_availabilty_message(
-    id: str, name: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs
+    id: str, name: str, topic: str = "boneIO", **kwargs
 ):
     """Create availability topic for HA."""
     return {
@@ -140,7 +140,7 @@ def ha_sensor_ina_availabilty_message(
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": model,
+            "model": "boneIO Relay Board",
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -154,7 +154,7 @@ def ha_sensor_ina_availabilty_message(
 
 
 def ha_sensor_temp_availabilty_message(
-    id: str, name: str, topic: str = "boneIO", model: str = "boneIO Relay Board", **kwargs
+    id: str, name: str, topic: str = "boneIO", **kwargs
 ):
     """Create availability topic for HA."""
     return {
@@ -162,7 +162,7 @@ def ha_sensor_temp_availabilty_message(
         "device": {
             "identifiers": [topic],
             "manufacturer": "boneIO",
-            "model": model,
+            "model": "boneIO Relay Board",
             "name": f"boneIO {topic}",
             "sw_version": __version__,
         },
@@ -204,12 +204,12 @@ def modbus_sensor_availabilty_message(
 
 
 def ha_cover_availabilty_message(
-    id: str, name: str, device_class: str, topic: str = "boneIO", model: str = "boneIO Relay Board"
+    id: str, name: str, device_class: str, topic: str = "boneIO"
 ):
     """Create Cover availability topic for HA."""
     kwargs = {"device_class": device_class} if device_class else {}
     msg = ha_availabilty_message(
-        device_type=COVER, topic=topic, id=id, name=name, model=model, **kwargs
+        device_type=COVER, topic=topic, id=id, name=name, **kwargs
     )
 
     return {

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/manager.py

@@ -49,7 +49,6 @@ from boneio.const import (
     cover_actions,
     relay_actions,
 )
-from boneio.cover import Cover
 from boneio.helper import (
     GPIOInputException,
     HostData,
@@ -121,7 +120,7 @@ class Manager:
 
         self._loop = asyncio.get_event_loop()
 
-        self._config_helper: ConfigHelper = config_helper
+        self._config_helper = config_helper
         self._host_data = None
         self._config_file_path = config_file_path
         self._state_manager = state_manager
@@ -142,7 +141,7 @@ class Manager:
         self._configured_output_groups = {}
         self._oled = None
         self._tasks: List[asyncio.Task] = []
-        self._covers: dict[str, Cover] = {}
+        self._covers = {}
         self._temp_sensors: List[TempSensor] = []
         self._ina219_sensors = []
         self._modbus_sensors = {}
@@ -939,7 +938,7 @@ class Manager:
             return
         topic_prefix = topic_prefix or self._config_helper.topic_prefix
         payload = availability_msg_func(
-            topic=topic_prefix, id=id, name=name, model=self._config_helper.device_type.title(), **kwargs
+            topic=topic_prefix, id=id, name=name, **kwargs
         )
         topic = f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{topic_prefix}/{id}/config"
         _LOGGER.debug("Sending HA discovery for %s entity, %s.", ha_type, name)

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/runner.py

@@ -96,7 +96,6 @@ async def async_run(
     main_config = config.get(BONEIO, {})
     _config_helper = ConfigHelper(
         name=main_config.get(NAME, BONEIO),
-        device_type=main_config.get("device_type", "boneIO Black"),
         topic_prefix=config.get(MQTT, {}).get(TOPIC_PREFIX, None),
         ha_discovery=config.get(MQTT, {}).get(HA_DISCOVERY, {}).get(ENABLED, False),
         ha_discovery_prefix=config.get(MQTT, {}).get(HA_DISCOVERY, {}).get(TOPIC_PREFIX, "homeassistant"),

boneio-0.10.1.dev1/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.10.1dev1"

{boneio-0.10.1 → boneio-0.10.1.dev1}/boneio/webui/app.py

@@ -492,7 +492,7 @@ async def cover_action(cover_id: str, action_data: CoverAction, manager: Manager
     elif action == "close":
         await cover.close()
     elif action == "stop":
-        await cover.stop()
+        await cover.async_stop()
     
     return {"status": "success"}
 

{boneio-0.10.1 → boneio-0.10.1.dev1}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "qrcode==7.4.2",
 ]
 requires-python = ">=3.7"
-version = "0.10.1"
+version = "0.10.1.dev1"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneio-0.10.1/boneio/version.py

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