zwave-js-server-python 0.62.0__tar.gz → 0.64.0__tar.gz

{zwave_js_server_python-0.62.0/zwave_js_server_python.egg-info → zwave_js_server_python-0.64.0}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: zwave-js-server-python
-Version: 0.62.0
+Version: 0.64.0
 Summary: Python wrapper for zwave-js-server
 Author-email: Home Assistant Team <hello@home-assistant.io>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Source Code, https://github.com/home-assistant-libs/zwave-js-server-python
 Project-URL: Bug Reports, https://github.com/home-assistant-libs/zwave-js-server-python/issues
 Keywords: home,automation,zwave,zwave-js
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>3
 Requires-Dist: pydantic>=1.10.0
+Dynamic: license-file
 
 # zwave-js-server-python
 

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=77.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,7 +8,7 @@ authors = [{ name = "Home Assistant Team", email = "hello@home-assistant.io" }]
 description = "Python wrapper for zwave-js-server"
 readme = "README.md"
 requires-python = ">=3.12"
-license = { text = "Apache-2.0" }
+license = "Apache-2.0"
 keywords = ["home", "automation", "zwave", "zwave-js"]
 classifiers = [
     "Development Status :: 4 - Beta",

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server/const/__init__.py

@@ -8,12 +8,12 @@ import logging
 from typing import TypedDict
 
 PACKAGE_NAME = "zwave-js-server-python"
-__version__ = "0.62.0"
+__version__ = "0.64.0"
 
 # minimal server schema version we can handle
-MIN_SERVER_SCHEMA_VERSION = 39
+MIN_SERVER_SCHEMA_VERSION = 41
 # max server schema version we can handle (and our code is compatible with)
-MAX_SERVER_SCHEMA_VERSION = 40
+MAX_SERVER_SCHEMA_VERSION = 43
 
 VALUE_UNKNOWN = "unknown"
 

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server/firmware.py

@@ -7,10 +7,7 @@ import asyncio
 import aiohttp
 
 from .client import Client
-from .model.controller.firmware import (
-    ControllerFirmwareUpdateData,
-    ControllerFirmwareUpdateResult,
-)
+from .model.driver.firmware import DriverFirmwareUpdateData, DriverFirmwareUpdateResult
 from .model.node import Node
 from .model.node.firmware import NodeFirmwareUpdateData, NodeFirmwareUpdateResult
 
@@ -45,16 +42,16 @@ async def update_firmware(
     return NodeFirmwareUpdateResult(node, data["result"])
 
 
-async def controller_firmware_update_otw(
+async def driver_firmware_update_otw(
     url: str,
-    firmware_file: ControllerFirmwareUpdateData,
+    firmware_file: DriverFirmwareUpdateData,
     session: aiohttp.ClientSession,
     additional_user_agent_components: dict[str, str] | None = None,
-) -> ControllerFirmwareUpdateResult:
+) -> DriverFirmwareUpdateResult:
     """
-    Send firmwareUpdateOTW command to Controller.
+    Send firmwareUpdateOTW command to Driver.
 
-    Sending the wrong firmware to a controller can brick it and make it unrecoverable.
+    Sending the wrong firmware to a driver can brick it and make it unrecoverable.
     Consumers of this library should build mechanisms to ensure that users understand
     the risks.
     """
@@ -68,7 +65,7 @@ async def controller_firmware_update_otw(
 
     data = await client.async_send_command(
         {
-            "command": "controller.firmware_update_otw",
+            "command": "driver.firmware_update_otw",
             **firmware_file.to_dict(),
         },
         require_schema=29,
@@ -77,4 +74,4 @@ async def controller_firmware_update_otw(
     if not receive_task.done():
         receive_task.cancel()
 
-    return ControllerFirmwareUpdateResult(data["result"])
+    return DriverFirmwareUpdateResult(data["result"])

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server/model/controller/__init__.py

@@ -27,7 +27,6 @@ from ..node import Node
 from ..node.firmware import NodeFirmwareUpdateResult
 from .data_model import ControllerDataType
 from .event_model import CONTROLLER_EVENT_MODEL_MAP
-from .firmware import ControllerFirmwareUpdateProgress, ControllerFirmwareUpdateResult
 from .inclusion_and_provisioning import (
     InclusionGrant,
     ProvisioningEntry,
@@ -80,7 +79,6 @@ class Controller(EventBase):
         self._rebuild_routes_progress: dict[Node, RebuildRoutesStatus] | None = None
         self._last_rebuild_routes_result: dict[Node, RebuildRoutesStatus] | None = None
         self._statistics = ControllerStatistics(DEFAULT_CONTROLLER_STATISTICS)
-        self._firmware_update_progress: ControllerFirmwareUpdateProgress | None = None
         for node_state in state["nodes"]:
             node = Node(client, node_state)
             self.nodes[node.node_id] = node
@@ -235,11 +233,6 @@ class Controller(EventBase):
             return None
         return RFRegion(rf_region)
 
-    @property
-    def firmware_update_progress(self) -> ControllerFirmwareUpdateProgress | None:
-        """Return firmware update progress."""
-        return self._firmware_update_progress
-
     @property
     def status(self) -> ControllerStatus:
         """Return status."""
@@ -812,6 +805,13 @@ class Controller(EventBase):
         )
         return cast(bool, data["success"])
 
+    async def async_toggle_rf(self, enable: bool) -> bool:
+        """Send toggleRF command to Controller."""
+        data = await self.client.async_send_command(
+            {"command": "controller.toggle_rf", "enable": enable}, require_schema=43
+        )
+        return cast(bool, data["success"])
+
     async def async_get_known_lifeline_routes(
         self,
     ) -> dict[Node, ControllerLifelineRoutes]:
@@ -902,19 +902,6 @@ class Controller(EventBase):
         event.data["controller"] = self
         self.emit(event.type, event.data)
 
-    def handle_firmware_update_progress(self, event: Event) -> None:
-        """Process a firmware update progress event."""
-        self._firmware_update_progress = event.data["firmware_update_progress"] = (
-            ControllerFirmwareUpdateProgress(event.data["progress"])
-        )
-
-    def handle_firmware_update_finished(self, event: Event) -> None:
-        """Process a firmware update finished event."""
-        self._firmware_update_progress = None
-        event.data["firmware_update_finished"] = ControllerFirmwareUpdateResult(
-            event.data["result"]
-        )
-
     def handle_inclusion_failed(self, event: Event) -> None:
         """Process an inclusion failed event."""
 

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server/model/controller/event_model.py

@@ -7,10 +7,6 @@ from typing import Literal, TypedDict
 from ...const import InclusionState, InclusionStrategy, RemoveNodeReason
 from ...event import BaseEventModel
 from ..node.data_model import FoundNodeDataType, NodeDataType
-from .firmware import (
-    ControllerFirmwareUpdateProgressDataType,
-    ControllerFirmwareUpdateResultDataType,
-)
 from .inclusion_and_provisioning import InclusionGrantDataType
 from .statistics import ControllerStatisticsDataType
 
@@ -46,38 +42,6 @@ class ExclusionStoppedEventModel(BaseControllerEventModel):
     event: Literal["exclusion stopped"]
 
 
-class FirmwareUpdateFinishedEventModel(BaseControllerEventModel):
-    """Model for `firmware update finished` event data."""
-
-    event: Literal["firmware update finished"]
-    result: ControllerFirmwareUpdateResultDataType
-
-    @classmethod
-    def from_dict(cls, data: dict) -> FirmwareUpdateFinishedEventModel:
-        """Initialize from dict."""
-        return cls(
-            source=data["source"],
-            event=data["event"],
-            result=data["result"],
-        )
-
-
-class FirmwareUpdateProgressEventModel(BaseControllerEventModel):
-    """Model for `firmware update progress` event data."""
-
-    event: Literal["firmware update progress"]
-    progress: ControllerFirmwareUpdateProgressDataType
-
-    @classmethod
-    def from_dict(cls, data: dict) -> FirmwareUpdateProgressEventModel:
-        """Initialize from dict."""
-        return cls(
-            source=data["source"],
-            event=data["event"],
-            progress=data["progress"],
-        )
-
-
 class GrantSecurityClassesEventModel(BaseControllerEventModel):
     """Model for `grant security classes` event data."""
 
@@ -343,8 +307,6 @@ CONTROLLER_EVENT_MODEL_MAP: dict[str, type[BaseControllerEventModel]] = {
     "exclusion failed": ExclusionFailedEventModel,
     "exclusion started": ExclusionStartedEventModel,
     "exclusion stopped": ExclusionStoppedEventModel,
-    "firmware update finished": FirmwareUpdateFinishedEventModel,
-    "firmware update progress": FirmwareUpdateProgressEventModel,
     "grant security classes": GrantSecurityClassesEventModel,
     "rebuild routes done": RebuildRoutesDoneEventModel,
     "rebuild routes progress": RebuildRoutesProgressEventModel,

zwave_js_server_python-0.62.0/zwave_js_server/model/driver.py → zwave_js_server_python-0.64.0/zwave_js_server/model/driver/__init__.py

@@ -4,11 +4,17 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Literal, cast
 
-from ..event import BaseEventModel, Event, EventBase
-from .config_manager import ConfigManager
-from .controller import Controller
-from .log_config import LogConfig, LogConfigDataType
-from .log_message import LogMessage, LogMessageDataType
+from ...event import BaseEventModel, Event, EventBase
+from ..config_manager import ConfigManager
+from ..controller import Controller
+from ..log_config import LogConfig, LogConfigDataType
+from ..log_message import LogMessage, LogMessageDataType
+from .firmware import (
+    DriverFirmwareUpdateProgress,
+    DriverFirmwareUpdateProgressDataType,
+    DriverFirmwareUpdateResult,
+    DriverFirmwareUpdateResultDataType,
+)
 
 try:
     from pydantic.v1 import create_model_from_typeddict
@@ -16,7 +22,7 @@ except ImportError:
     from pydantic import create_model_from_typeddict
 
 if TYPE_CHECKING:
-    from ..client import Client
+    from ...client import Client
 
 
 class BaseDriverEventModel(BaseEventModel):
@@ -52,10 +58,51 @@ LoggingEventModel = create_model_from_typeddict(
 )
 
 
+class DriverReadyEventModel(BaseDriverEventModel):
+    """Model for `driver ready` event data."""
+
+    event: Literal["driver ready"]
+
+
+class FirmwareUpdateFinishedEventModel(BaseDriverEventModel):
+    """Model for `firmware update finished` event data."""
+
+    event: Literal["firmware update finished"]
+    result: DriverFirmwareUpdateResultDataType
+
+    @classmethod
+    def from_dict(cls, data: dict) -> FirmwareUpdateFinishedEventModel:
+        """Initialize from dict."""
+        return cls(
+            source=data["source"],
+            event=data["event"],
+            result=data["result"],
+        )
+
+
+class FirmwareUpdateProgressEventModel(BaseDriverEventModel):
+    """Model for `firmware update progress` event data."""
+
+    event: Literal["firmware update progress"]
+    progress: DriverFirmwareUpdateProgressDataType
+
+    @classmethod
+    def from_dict(cls, data: dict) -> FirmwareUpdateProgressEventModel:
+        """Initialize from dict."""
+        return cls(
+            source=data["source"],
+            event=data["event"],
+            progress=data["progress"],
+        )
+
+
 DRIVER_EVENT_MODEL_MAP: dict[str, type[BaseDriverEventModel]] = {
     "all nodes ready": AllNodesReadyEventModel,
     "log config updated": LogConfigUpdatedEventModel,
     "logging": LoggingEventModel,
+    "driver ready": DriverReadyEventModel,
+    "firmware update finished": FirmwareUpdateFinishedEventModel,
+    "firmware update progress": FirmwareUpdateProgressEventModel,
 }
 
 
@@ -81,6 +128,7 @@ class Driver(EventBase):
         self.controller = Controller(client, state)
         self.log_config = LogConfig.from_dict(log_config)
         self.config_manager = ConfigManager(client)
+        self._firmware_update_progress: DriverFirmwareUpdateProgress | None = None
 
     def __hash__(self) -> int:
         """Return the hash."""
@@ -92,6 +140,11 @@ class Driver(EventBase):
             return False
         return self.controller == other.controller
 
+    @property
+    def firmware_update_progress(self) -> DriverFirmwareUpdateProgress | None:
+        """Return firmware update progress."""
+        return self._firmware_update_progress
+
     def receive_event(self, event: Event) -> None:
         """Receive an event."""
         if event.data["source"] != "driver":
@@ -200,3 +253,19 @@ class Driver(EventBase):
 
     def handle_all_nodes_ready(self, event: Event) -> None:
         """Process a driver all nodes ready event."""
+
+    def handle_driver_ready(self, event: Event) -> None:
+        """Process a driver ready event."""
+
+    def handle_firmware_update_progress(self, event: Event) -> None:
+        """Process a firmware update progress event."""
+        self._firmware_update_progress = event.data["firmware_update_progress"] = (
+            DriverFirmwareUpdateProgress(event.data["progress"])
+        )
+
+    def handle_firmware_update_finished(self, event: Event) -> None:
+        """Process a firmware update finished event."""
+        self._firmware_update_progress = None
+        event.data["firmware_update_finished"] = DriverFirmwareUpdateResult(
+            event.data["result"]
+        )

{zwave_js_server_python-0.62.0/zwave_js_server/model/controller → zwave_js_server_python-0.64.0/zwave_js_server/model/driver}/firmware.py

@@ -1,4 +1,4 @@
-"""Provide a model for Z-Wave controller firmware."""
+"""Provide a model for Z-Wave driver firmware."""
 
 from __future__ import annotations
 
@@ -9,8 +9,8 @@ from typing import TypedDict
 from ...util.helpers import convert_bytes_to_base64
 
 
-class ControllerFirmwareUpdateDataDataType(TypedDict, total=False):
-    """Represent a controller firmware update data dict type."""
+class DriverFirmwareUpdateDataDataType(TypedDict, total=False):
+    """Represent a driver firmware update data dict type."""
 
     filename: str  # required
     file: str  # required
@@ -18,16 +18,16 @@ class ControllerFirmwareUpdateDataDataType(TypedDict, total=False):
 
 
 @dataclass
-class ControllerFirmwareUpdateData:
-    """Controller firmware update data."""
+class DriverFirmwareUpdateData:
+    """Driver firmware update data."""
 
     filename: str
     file: bytes
     file_format: str | None = None
 
-    def to_dict(self) -> ControllerFirmwareUpdateDataDataType:
+    def to_dict(self) -> DriverFirmwareUpdateDataDataType:
         """Convert firmware update data to dict."""
-        data: ControllerFirmwareUpdateDataDataType = {
+        data: DriverFirmwareUpdateDataDataType = {
             "filename": self.filename,
             "file": convert_bytes_to_base64(self.file),
         }
@@ -36,10 +36,10 @@ class ControllerFirmwareUpdateData:
         return data
 
 
-class ControllerFirmwareUpdateStatus(IntEnum):
-    """Enum with all controller firmware update status values.
+class DriverFirmwareUpdateStatus(IntEnum):
+    """Enum with all driver firmware update status values.
 
-    https://zwave-js.github.io/node-zwave-js/#/api/controller?id=quotfirmware-update-finishedquot
+    https://zwave-js.github.io/node-zwave-js/#/api/driver?id=quotfirmware-update-finishedquot
     """
 
     ERROR_TIMEOUT = 0
@@ -47,13 +47,13 @@ class ControllerFirmwareUpdateStatus(IntEnum):
     ERROR_RETRY_LIMIT_REACHED = 1
     # The update was aborted by the bootloader
     ERROR_ABORTED = 2
-    # This controller does not support firmware updates
+    # This driver does not support firmware updates
     ERROR_NOT_SUPPORTED = 3
     OK = 255
 
 
-class ControllerFirmwareUpdateProgressDataType(TypedDict):
-    """Represent a controller firmware update progress dict type."""
+class DriverFirmwareUpdateProgressDataType(TypedDict):
+    """Represent a driver firmware update progress dict type."""
 
     sentFragments: int
     totalFragments: int
@@ -61,10 +61,10 @@ class ControllerFirmwareUpdateProgressDataType(TypedDict):
 
 
 @dataclass
-class ControllerFirmwareUpdateProgress:
-    """Model for a controller firmware update progress data."""
+class DriverFirmwareUpdateProgress:
+    """Model for a driver firmware update progress data."""
 
-    data: ControllerFirmwareUpdateProgressDataType = field(repr=False)
+    data: DriverFirmwareUpdateProgressDataType = field(repr=False)
     sent_fragments: int = field(init=False)
     total_fragments: int = field(init=False)
     progress: float = field(init=False)
@@ -76,22 +76,22 @@ class ControllerFirmwareUpdateProgress:
         self.progress = float(self.data["progress"])
 
 
-class ControllerFirmwareUpdateResultDataType(TypedDict):
-    """Represent a controller firmware update result dict type."""
+class DriverFirmwareUpdateResultDataType(TypedDict):
+    """Represent a driver firmware update result dict type."""
 
     status: int
     success: bool
 
 
 @dataclass
-class ControllerFirmwareUpdateResult:
-    """Model for controller firmware update result data."""
+class DriverFirmwareUpdateResult:
+    """Model for driver firmware update result data."""
 
-    data: ControllerFirmwareUpdateResultDataType = field(repr=False)
-    status: ControllerFirmwareUpdateStatus = field(init=False)
+    data: DriverFirmwareUpdateResultDataType = field(repr=False)
+    status: DriverFirmwareUpdateStatus = field(init=False)
     success: bool = field(init=False)
 
     def __post_init__(self) -> None:
         """Post initialize."""
-        self.status = ControllerFirmwareUpdateStatus(self.data["status"])
+        self.status = DriverFirmwareUpdateStatus(self.data["status"])
         self.success = self.data["success"]

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server/model/node/data_model.py

@@ -67,3 +67,4 @@ class NodeDataType(TypedDict, total=False):
     defaultVolume: int | float | None
     defaultTransitionDuration: int | float | None
     protocol: int
+    sdkVersion: str | None

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0/zwave_js_server_python.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: zwave-js-server-python
-Version: 0.62.0
+Version: 0.64.0
 Summary: Python wrapper for zwave-js-server
 Author-email: Home Assistant Team <hello@home-assistant.io>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Source Code, https://github.com/home-assistant-libs/zwave-js-server-python
 Project-URL: Bug Reports, https://github.com/home-assistant-libs/zwave-js-server-python/issues
 Keywords: home,automation,zwave,zwave-js
@@ -19,6 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>3
 Requires-Dist: pydantic>=1.10.0
+Dynamic: license-file
 
 # zwave-js-server-python
 

{zwave_js_server_python-0.62.0 → zwave_js_server_python-0.64.0}/zwave_js_server_python.egg-info/SOURCES.txt

@@ -37,7 +37,6 @@ zwave_js_server/model/association.py
 zwave_js_server/model/command_class.py
 zwave_js_server/model/device_class.py
 zwave_js_server/model/device_config.py
-zwave_js_server/model/driver.py
 zwave_js_server/model/duration.py
 zwave_js_server/model/endpoint.py
 zwave_js_server/model/log_config.py
@@ -51,10 +50,11 @@ zwave_js_server/model/config_manager/__init__.py
 zwave_js_server/model/controller/__init__.py
 zwave_js_server/model/controller/data_model.py
 zwave_js_server/model/controller/event_model.py
-zwave_js_server/model/controller/firmware.py
 zwave_js_server/model/controller/inclusion_and_provisioning.py
 zwave_js_server/model/controller/rebuild_routes.py
 zwave_js_server/model/controller/statistics.py
+zwave_js_server/model/driver/__init__.py
+zwave_js_server/model/driver/firmware.py
 zwave_js_server/model/node/__init__.py
 zwave_js_server/model/node/data_model.py
 zwave_js_server/model/node/event_model.py