boneIO 0.9.0.dev3__tar.gz → 0.9.0.dev4__tar.gz

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/PKG-INFO

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

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/helper/config.py

@@ -22,11 +22,13 @@ from boneio.const import (
 class ConfigHelper:
     def __init__(
         self,
-        topic_prefix: str = BONEIO,
+        topic_prefix: str,
+        name: str = BONEIO,
         ha_discovery: bool = True,
         ha_discovery_prefix: str = HOMEASSISTANT,
     ):
-        self._topic_prefix = topic_prefix
+        self._name = name
+        self._topic_prefix = topic_prefix if topic_prefix else name
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
         self._fetch_old_discovery = None
@@ -45,6 +47,10 @@ class ConfigHelper:
     def topic_prefix(self) -> str:
         return self._topic_prefix
 
+    @property
+    def name(self) -> str:
+        return self._name
+
     @property
     def ha_discovery(self) -> bool:
         return self._ha_discovery

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/helper/yaml_util.py

@@ -180,16 +180,49 @@ def get_board_config_path(board_name: str, version: str) -> str:
     )
 
 
+def normalize_board_name(name: str) -> str:
+    """Normalize board name to a standard format.
+    
+    Examples:
+        32x10a, 32x10A, 32 -> 32_10
+        cover -> cover
+        cover mix, cm -> cover_mix
+        24x16A, 24x16, 24 -> 24_16
+    """
+    if not name:
+        return name
+
+    name = name.lower().strip()
+    
+    # Handle cover mix variations
+    if name in ('cm', 'cover mix', 'covermix', "cover_mix"):
+        return 'cover_mix'
+    
+    # Handle simple cover case
+    if name == 'cover':
+        return 'cover'
+    
+    # Handle 32x10A variations
+    if name.startswith('32'):
+        return '32_10'
+    
+    # Handle 24x16A variations
+    if name.startswith('24'):
+        return '24_16'
+    
+    return name
+
+
 def merge_board_config(config: dict) -> dict:
     """Merge predefined board configuration with user config."""
-    if not config.get("boneio", {}).get("relay_board"):
+    if not config.get("boneio", {}).get("device_type"):
         return config
 
-    board_name = config["boneio"]["relay_board"]
+    board_name = normalize_board_name(config["boneio"]["device_type"])
     version = config["boneio"]["version"]
     
     try:
-        board_file = get_board_config_path(board_name, version)
+        board_file = get_board_config_path(f"output_{board_name}", version)
         input_file = get_board_config_path("input", version)
         board_config = load_yaml_file(board_file)
         input_config = load_yaml_file(input_file)

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/modbus/sensor.py

@@ -243,7 +243,7 @@ class ModbusSensor(BasicMqtt, AsyncUpdater, Filter):
                         id=sensor.id,
                         name=sensor.name,
                         state=sensor.state,
-                        unit_of_measurement=sensor.unit_of_measurement,
+                        unit=sensor.unit_of_measurement,
                         timestamp=sensor.last_timestamp,
                     ),
                 )

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/runner.py

@@ -83,7 +83,8 @@ async def async_run(
 
     main_config = config.get(BONEIO, {})
     _config_helper = ConfigHelper(
-        topic_prefix=config.get(MQTT, {}).get(TOPIC_PREFIX, main_config.get(NAME, BONEIO)),
+        name=main_config.get(NAME, BONEIO),
+        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"),
     )
@@ -146,6 +147,7 @@ async def async_run(
         _LOGGER.info("Starting Web server.")
         web_server = WebServer(
             config_file=config_file,
+            config_helper=_config_helper,
             manager=manager,
             port=web_config.get("port", 8090),  
             auth=web_config.get("auth", {}),  

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/schema/schema.yaml

@@ -906,8 +906,11 @@ boneio:
       required: False
       meta:
         label: BoneIO Black Hardware version
-    relay_board:
+    device_type:
       type: string
       required: False
+      coerce:
+        - str
+        - lower
       meta:
-        label: Predefined relay board configuration
+        label: Predefined device type configuration

boneIO-0.9.0.dev4/boneio/version.py

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

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/webui/app.py

@@ -31,6 +31,7 @@ from starlette.responses import JSONResponse
 from starlette.types import Receive, Scope, Send
 from starlette.websockets import WebSocketState
 
+from boneio.helper.config import ConfigHelper
 from boneio.helper.events import GracefulExit
 from boneio.manager import Manager
 from boneio.models import (
@@ -121,6 +122,10 @@ def get_manager():
     """Get manager instance."""
     return app.state.manager
 
+def get_config_helper():
+    """Get config helper instance."""
+    return app.state.config_helper
+
 
 # Add auth required endpoint
 @app.get("/api/auth/required")
@@ -457,7 +462,7 @@ async def toggle_output(output_id: str, manager: Manager = Depends(get_manager))
 
 
 @app.post("/api/restart")
-async def restart_service(background_tasks: BackgroundTasks, manager: Manager = Depends(get_manager)):
+async def restart_service(background_tasks: BackgroundTasks):
     """Restart the BoneIO service."""
     if not is_running_as_service():
         return {"status": "not available"}
@@ -477,6 +482,11 @@ async def get_version():
     """Get application version."""
     return {"version": __version__} 
 
+@app.get("/api/name")
+async def get_name(config_helper: ConfigHelper = Depends(get_config_helper)):
+    """Get application version."""
+    return {"name": config_helper.name} 
+
 
 @app.get("/api/files")
 async def list_files(path: str = None):
@@ -594,6 +604,7 @@ async def modbus_sensor_state_changed(event: SensorState):
 def init_app(
     manager: Manager,
     yaml_config_file: str,
+    config_helper: ConfigHelper,
     auth_config: dict = {},
     jwt_secret: str = None,
     web_server = None,
@@ -611,6 +622,7 @@ def init_app(
     app.state.auth_config = auth_config
     app.state.yaml_config_file = yaml_config_file
     app.state.web_server = web_server
+    app.state.config_helper = config_helper
     app.state.websocket_manager = WebSocketManager(
         jwt_secret=jwt_secret,
         auth_required=bool(auth_config)

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/boneio/webui/web_server.py

@@ -9,15 +9,17 @@ from pathlib import Path
 from hypercorn.asyncio import serve
 from hypercorn.config import Config
 
+from boneio.helper.config import ConfigHelper
 from boneio.manager import Manager
 from boneio.webui.app import BoneIOApp, init_app
 
 _LOGGER = logging.getLogger(__name__)
 
 class WebServer:
-    def __init__(self, config_file: str, manager: Manager, port: int = 8080, auth: dict = {}, logger: dict = {}, debug_level: int = 0) -> None:
+    def __init__(self, config_file: str, config_helper: ConfigHelper, manager: Manager, port: int = 8080, auth: dict = {}, logger: dict = {}, debug_level: int = 0) -> None:
         """Initialize the web server."""
         self.config_file = config_file
+        self.config_helper = config_helper
         self.manager = manager
         self._shutdown_event = asyncio.Event()
         
@@ -34,6 +36,7 @@ class WebServer:
             yaml_config_file=self._yaml_config_file, 
             auth_config=auth, 
             jwt_secret=self.jwt_secret,
+            config_helper=self.config_helper,
             web_server=self
         )
         

{boneIO-0.9.0.dev3 → boneIO-0.9.0.dev4}/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "python-jose[cryptography]==3.3.0",
 ]
 requires-python = ">=3.7"
-version = "0.9.0.dev3"
+version = "0.9.0.dev4"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneIO-0.9.0.dev3/boneio/version.py

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