boneIO 0.9.0.dev8__tar.gz → 0.9.0.dev11__tar.gz

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/PKG-INFO

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

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/oled.py

@@ -293,13 +293,15 @@ class Oled:
         display_image = Image.new("1", (128, 64), 0)  # Mode 1, size 128x64, black background
         draw = ImageDraw.Draw(display_image)
         
-        # Add title text
-        title = "WebUI"
-        draw.text((2, 2), title, font=fonts["small"], fill=WHITE)
+        # Add title text on the left side
+        # text_width = fonts["small"].getsize(title)[0]
+        draw.text((2, 2), "Scan to", font=fonts["small"], fill=WHITE)
+        draw.text((2, 12), "access", font=fonts["small"], fill=WHITE)
+        draw.text((2, 22), "webui", font=fonts["small"], fill=WHITE)
         
-        # Calculate position to center the QR code, accounting for title
-        x = (128 - qr_image.size[0]) // 2
-        y = ((64 - qr_image.size[1]) // 2) + 5  # Add 5 pixels to move QR code down a bit
+        # Calculate position to align QR code to right and center vertically
+        x = 128 - qr_image.size[0] - 2  # Align to right with 2 pixels padding
+        y = ((64 - qr_image.size[1]) // 2)  # Center vertically
         
         # Paste QR code onto center of display image
         display_image.paste(qr_image, (x, y))

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/runner.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import os
+import signal
 import warnings
 from typing import Any, Set
 
@@ -76,6 +77,17 @@ async def async_run(
     web_server = None
     tasks: Set[asyncio.Task] = set()
     event_bus = EventBus(loop=asyncio.get_event_loop())
+    shutdown_event = asyncio.Event()
+    loop = asyncio.get_event_loop()
+
+    def signal_handler():
+        """Handle shutdown signals."""
+        _LOGGER.info("Received shutdown signal, initiating graceful shutdown...")
+        shutdown_event.set()
+        
+    # Register signal handlers
+    for sig in (signal.SIGTERM, signal.SIGINT):
+        loop.add_signal_handler(sig, signal_handler)
 
     event_bus_task = asyncio.create_task(event_bus.start())
     tasks.add(event_bus_task)
@@ -134,14 +146,13 @@ async def async_run(
 
     tasks.update(manager.get_tasks())
 
-    
     message_bus_type = "MQTT" if isinstance(message_bus, MQTTClient) else "Local"
     _LOGGER.info("Starting message bus %s.", message_bus_type)
     message_bus_task = asyncio.create_task(message_bus.start_client())
     tasks.add(message_bus_task)
     message_bus_task.add_done_callback(tasks.discard)
     
-        # Start web server if configured
+    # Start web server if configured
     if "web" in config:
         web_config = config.get("web") or {}
         _LOGGER.info("Starting Web server.")
@@ -159,15 +170,51 @@ async def async_run(
         web_server_task.add_done_callback(tasks.discard)
     else:
         _LOGGER.info("Web server not configured.")
+
     try:
-        await asyncio.gather(*tasks)
+        # Convert tasks set to list for main gather
+        task_list = list(tasks)
+        main_gather = asyncio.gather(*task_list)
+        
+        # Wait for either shutdown signal or main task completion
+        await asyncio.wait([
+            main_gather,
+            asyncio.create_task(shutdown_event.wait())
+        ], return_when=asyncio.FIRST_COMPLETED)
+
+        if shutdown_event.is_set():
+            _LOGGER.info("Starting graceful shutdown...")
+            main_gather.cancel()
+            try:
+                await main_gather
+            except asyncio.CancelledError:
+                pass
+
         return 0
     except asyncio.CancelledError:
-        pass
+        _LOGGER.info("Main task cancelled")
     except (RestartRequestException, GracefulExit):
-        pass
+        _LOGGER.info("Restart or graceful exit requested")
     except Exception as e:
         _LOGGER.error(f"Unexpected error: {type(e).__name__} - {e}")
     finally:
+        _LOGGER.info("Cleaning up resources...")
+        # Stop the event bus
         event_bus.request_stop()
+        
+        # Create a copy of tasks set to avoid modification during iteration
+        remaining_tasks = list(tasks)
+        if remaining_tasks:
+            # Cancel and wait for all remaining tasks
+            for task in remaining_tasks:
+                if not task.done():
+                    task.cancel()
+            
+            # Wait for all tasks to complete
+            try:
+                await asyncio.gather(*remaining_tasks, return_exceptions=True)
+            except Exception as e:
+                _LOGGER.error(f"Error during cleanup: {type(e).__name__} - {e}")
+        
+        _LOGGER.info("Shutdown complete")
         return 0

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/schema/schema.yaml

@@ -226,14 +226,19 @@ modbus_sensors:
           - lower
         allowed:
           [
-            'sdm630',
+            'cwt',
+            'dts1964_3f',
+            'liquid-sensor',
+            'orno-or-we-517',
+            'pt100',
+            'r4dcb08',
             'sdm120',
-            'sofar',
+            'sdm630',
+            'sht20',
+            'sht30',
             'socomec_e03',
             'socomec_e23',
-            'cwt',
-            'orno-or-we-517',
-            'r4cb08'
+            'sofar',
           ]
         meta:
           label: Model to load from database.

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/sensor/gpio_new.py

@@ -1,9 +1,10 @@
 """GpioInputBinarySensorNew to receive signals."""
 
 import logging
-from boneio.const import PRESSED, RELEASED, BOTH
-from boneio.helper import GpioBaseClass
 import time
+
+from boneio.const import BOTH, PRESSED, RELEASED
+from boneio.helper import GpioBaseClass
 from boneio.helper.gpio import add_event_callback, add_event_detect
 
 _LOGGER = logging.getLogger(__name__)

boneio-0.9.0.dev11/boneio/version.py

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

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/webui/app.py

@@ -771,6 +771,7 @@ async def websocket_endpoint(
                             state=output.state,
                             type=output.output_type,
                             pin=output.pin_id,
+                            expander_id=output.expander_id,
                             timestamp=output.last_timestamp,
                         )
                         update = StateUpdate(type="output", data=output_state)

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/boneio/webui/web_server.py

@@ -46,9 +46,20 @@ class WebServer:
         self._hypercorn_config.bind = [f"0.0.0.0:{port}"]
         self._hypercorn_config.use_reloader = False
         self._hypercorn_config.worker_class = "asyncio"
-        # if debug_level:
-            # self._hypercorn_config.debug = debug_level == 1
-            # self._hypercorn_config.loglevel = debug_level
+        
+        # Configure Hypercorn's logging
+        hypercorn_logger = logging.getLogger('hypercorn.error')
+        hypercorn_logger.handlers = []  # Remove default handlers
+        hypercorn_logger.propagate = True  # Use root logger's handlers
+        
+        # Configure access log
+        hypercorn_access_logger = logging.getLogger('hypercorn.access')
+        hypercorn_access_logger.handlers = []  # Remove default handlers
+        hypercorn_access_logger.propagate = True  # Use root logger's handlers
+        
+        self._hypercorn_config.accesslog = hypercorn_access_logger
+        self._hypercorn_config.errorlog = hypercorn_logger
+        
         self._hypercorn_config.graceful_timeout = 5.0
         # self._server = hypercorn.asyncio.serve(self.app, self._hypercorn_config)
         # Override the server's install_signal_handlers to prevent it from handling signals

{boneio-0.9.0.dev8 → boneio-0.9.0.dev11}/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "qrcode==7.4.2",
 ]
 requires-python = ">=3.7"
-version = "0.9.0.dev8"
+version = "0.9.0.dev11"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneio-0.9.0.dev8/boneio/version.py

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