zwave-js-server-python 0.64.0__py3-none-any.whl → 0.66.0__py3-none-any.whl

zwave_js_server/const/__init__.py

@@ -8,7 +8,7 @@ import logging
 from typing import TypedDict
 
 PACKAGE_NAME = "zwave-js-server-python"
-__version__ = "0.64.0"
+__version__ = "0.66.0"
 
 # minimal server schema version we can handle
 MIN_SERVER_SCHEMA_VERSION = 41

zwave_js_server/event.py

@@ -7,10 +7,7 @@ from dataclasses import dataclass, field
 import logging
 from typing import Literal
 
-try:
-    from pydantic.v1 import BaseModel
-except ImportError:
-    from pydantic import BaseModel
+from pydantic import BaseModel
 
 LOGGER = logging.getLogger(__package__)
 

zwave_js_server/model/controller/__init__.py

@@ -736,14 +736,17 @@ class Controller(EventBase):
         )
         return convert_base64_to_bytes(data["nvmData"])
 
-    async def async_restore_nvm(self, file: bytes) -> None:
+    async def async_restore_nvm(
+        self, file: bytes, options: dict[str, bool] | None = None
+    ) -> None:
         """Send restoreNVM command to Controller."""
         await self.client.async_send_command(
             {
                 "command": "controller.restore_nvm",
                 "nvmData": convert_bytes_to_base64(file),
+                "migrateOptions": {} if options is None else options,
             },
-            require_schema=14,
+            require_schema=42,
         )
 
     async def async_backup_nvm_raw_base64(self) -> str:
@@ -753,14 +756,17 @@ class Controller(EventBase):
         )
         return data["nvmData"]
 
-    async def async_restore_nvm_base64(self, base64_data: str) -> None:
+    async def async_restore_nvm_base64(
+        self, base64_data: str, options: dict[str, bool] | None = None
+    ) -> None:
         """Send restoreNVM command to Controller with base64 data directly."""
         await self.client.async_send_command(
             {
                 "command": "controller.restore_nvm",
                 "nvmData": base64_data,
+                "migrateOptions": {} if options is None else options,
             },
-            require_schema=14,
+            require_schema=42,
         )
 
     async def async_get_power_level(self) -> dict[str, int]:

zwave_js_server/model/controller/statistics.py

@@ -53,6 +53,7 @@ class BackgroundRSSIDataType(TypedDict, total=False):
     channel0: ChannelRSSIDataType  # required
     channel1: ChannelRSSIDataType  # required
     channel2: ChannelRSSIDataType
+    channel3: ChannelRSSIDataType
 
 
 class ControllerStatisticsDataType(TypedDict, total=False):
@@ -94,16 +95,20 @@ class BackgroundRSSI:
     channel_0: ChannelRSSI = field(init=False)
     channel_1: ChannelRSSI = field(init=False)
     channel_2: ChannelRSSI | None = field(init=False)
+    channel_3: ChannelRSSI | None = field(init=False)
 
     def __post_init__(self) -> None:
         """Post initialize."""
         self.timestamp = self.data["timestamp"]
         self.channel_0 = ChannelRSSI(self.data["channel0"])
         self.channel_1 = ChannelRSSI(self.data["channel1"])
-        if not (channel_2 := self.data.get("channel2")):
-            self.channel_2 = None
-            return
-        self.channel_2 = ChannelRSSI(channel_2)
+        # Channels 2 and 3 may not be present, but 3 requires 2 to be present
+        self.channel_2 = None
+        self.channel_3 = None
+        if channel_2 := self.data.get("channel2"):
+            self.channel_2 = ChannelRSSI(channel_2)
+            if channel_3 := self.data.get("channel3"):
+                self.channel_3 = ChannelRSSI(channel_3)
 
 
 @dataclass

zwave_js_server/model/device_config.py

@@ -12,8 +12,8 @@ from typing import Any, Literal, TypedDict
 class DeviceDeviceDataType(TypedDict, total=False):
     """Represent a device device data dict type."""
 
-    productType: str
-    productId: str
+    productType: str | int
+    productId: str | int
 
 
 class DeviceDevice:
@@ -24,12 +24,12 @@ class DeviceDevice:
         self.data = data
 
     @property
-    def product_type(self) -> str | None:
+    def product_type(self) -> str | int | None:
         """Return product type."""
         return self.data.get("productType")
 
     @property
-    def product_id(self) -> str | None:
+    def product_id(self) -> str | int | None:
         """Return product id."""
         return self.data.get("productId")
 
@@ -125,7 +125,7 @@ class DeviceConfigDataType(TypedDict, total=False):
 
     filename: str
     manufacturer: str
-    manufacturerId: str
+    manufacturerId: int
     label: str
     description: str
     devices: list[DeviceDeviceDataType]
@@ -164,8 +164,8 @@ class DeviceConfig:
         return self.data.get("manufacturer")
 
     @property
-    def manufacturer_id(self) -> str | None:  # TODO: In the dump this is an int.
-        """Return manufacturer id (as defined in specs) as a 4-digit hex string."""
+    def manufacturer_id(self) -> int | None:
+        """Return manufacturer id (as defined in specs)."""
         return self.data.get("manufacturerId")
 
     @property

zwave_js_server/model/driver/__init__.py

@@ -2,8 +2,11 @@
 
 from __future__ import annotations
 
+import sys
 from typing import TYPE_CHECKING, Any, Literal, cast
 
+from pydantic import create_model
+
 from ...event import BaseEventModel, Event, EventBase
 from ..config_manager import ConfigManager
 from ..controller import Controller
@@ -16,10 +19,10 @@ from .firmware import (
     DriverFirmwareUpdateResultDataType,
 )
 
-try:
-    from pydantic.v1 import create_model_from_typeddict
-except ImportError:
-    from pydantic import create_model_from_typeddict
+if sys.version_info >= (3, 14):
+    from annotationlib import get_annotations
+else:
+    from typing_extensions import get_annotations
 
 if TYPE_CHECKING:
     from ...client import Client
@@ -53,8 +56,10 @@ class AllNodesReadyEventModel(BaseDriverEventModel):
     event: Literal["all nodes ready"]
 
 
-LoggingEventModel = create_model_from_typeddict(
-    LogMessageDataType, __base__=BaseDriverEventModel
+LoggingEventModel = create_model(
+    "LoggingEventModel",
+    **{k: (v, None) for k, v in get_annotations(LogMessageDataType).items()},
+    __base__=BaseDriverEventModel,
 )
 
 

zwave_js_server/model/node/event_model.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Literal
 
+from pydantic import BaseModel
+
 from ...const import CommandClass
 from ...event import BaseEventModel
 from ..notification import (
@@ -20,11 +22,6 @@ from .firmware import (
 )
 from .statistics import NodeStatisticsDataType
 
-try:
-    from pydantic.v1 import BaseModel
-except ImportError:
-    from pydantic import BaseModel
-
 
 class BaseNodeEventModel(BaseEventModel):
     """Base model for a node event."""
@@ -101,8 +98,8 @@ class InterviewFailedEventArgsModel(BaseModel):
 
     errorMessage: str
     isFinal: bool
-    attempt: int | None
-    maxAttempts: int | None
+    attempt: int | None = None
+    maxAttempts: int | None = None
 
     @classmethod
     def from_dict(cls, data: dict) -> InterviewFailedEventArgsModel:

zwave_js_server/model/node/statistics.py

@@ -25,7 +25,7 @@ class NodeStatisticsDataType(TypedDict, total=False):
     commandsDroppedTX: int  # required
     commandsDroppedRX: int  # required
     timeoutResponse: int  # required
-    rtt: int
+    rtt: float
     rssi: int
     lwr: RouteStatisticsDataType
     nlwr: RouteStatisticsDataType
@@ -43,7 +43,7 @@ class NodeStatistics:
     commands_dropped_rx: int = field(init=False)
     commands_dropped_tx: int = field(init=False)
     timeout_response: int = field(init=False)
-    rtt: int | None = field(init=False)
+    rtt: float | None = field(init=False)
     lwr: RouteStatistics | None = field(init=False, default=None)
     nlwr: RouteStatistics | None = field(init=False, default=None)
     last_seen: datetime | None = field(init=False, default=None)

zwave_js_server/model/value.py

@@ -40,7 +40,7 @@ class MetaDataType(TypedDict, total=False):
     label: str
     min: int | None
     max: int | None
-    unit: str
+    unit: str | None
     states: dict[str, str]
     ccSpecific: dict[str, Any]
     valueChangeOptions: list[str]

{zwave_js_server_python-0.64.0.dist-info → zwave_js_server_python-0.66.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwave-js-server-python
-Version: 0.64.0
+Version: 0.66.0
 Summary: Python wrapper for zwave-js-server
 Author-email: Home Assistant Team <hello@home-assistant.io>
 License-Expression: Apache-2.0
@@ -18,7 +18,8 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>3
-Requires-Dist: pydantic>=1.10.0
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: typing_extensions>=4.13.0; python_version < "3.14"
 Dynamic: license-file
 
 # zwave-js-server-python

{zwave_js_server_python-0.64.0.dist-info → zwave_js_server_python-0.66.0.dist-info}/RECORD

@@ -2,12 +2,12 @@ zwave_js_server/__init__.py,sha256=Ey3O4Tha56uU-M92oLJmQHupCJ7B9oZmxlQTo8pGUM8,4
 zwave_js_server/__main__.py,sha256=X6Zdbtv6QmYjsWeQ5OvtIRhtEyT1o3o0XvAmXtRrgoY,3659
 zwave_js_server/client.py,sha256=1kwujigWJU84-vT61vvYED2EeB-4JS_7gMqu4ipjlEI,19589
 zwave_js_server/dump.py,sha256=ZBhkC07ndrFd784zpogfjRJtAdEh8-y8ZycvrGf34sE,1523
-zwave_js_server/event.py,sha256=zz6hzhommpsqWOZul9JtI_RlX5hyn2KVNuAqH_0Cgsg,2435
+zwave_js_server/event.py,sha256=FBZ86ns4bEi95UAMrcinNs2WKHUbR7plAErIc1Ed0lg,2368
 zwave_js_server/exceptions.py,sha256=8SY6FA8NiTEQgtauLR83F7m69gBGQviJ6O2obirH2po,6148
 zwave_js_server/firmware.py,sha256=57L7olhmtJ0FosEi3GtinNjfayudbQxYRYhpgrzsj90,2328
 zwave_js_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zwave_js_server/version.py,sha256=PUwxOVcUMk5pOguQP9zAjiPjs1Nnmiwj3fcA4HJLiBg,401
-zwave_js_server/const/__init__.py,sha256=gZNzO4KQY1t8MMSGj079-VBC44Mg9pkcdqUTF_Y6f0o,14264
+zwave_js_server/const/__init__.py,sha256=4hSxTO1UyxMGPRV_mJX_JcYEF9ya-Tj6e3YGvLXAoe8,14264
 zwave_js_server/const/command_class/__init__.py,sha256=WilOppnr9CXahDjEEkAXyh_j7iCq_qZ1GtBkjWLoQUg,37
 zwave_js_server/const/command_class/barrier_operator.py,sha256=IJ195hGKEi1FLLqKWMtC2ZhY9Jt5PACr7GYTyVPjkKM,820
 zwave_js_server/const/command_class/basic.py,sha256=cs0k7p5qxrwpR8-NvXQLtnfEsC6IlBAYiW79DaM_6Eg,96
@@ -32,7 +32,7 @@ zwave_js_server/model/__init__.py,sha256=XfyKH8lxZ3CB7CbRkOr5sR-eV0GrklZiBtNPmln
 zwave_js_server/model/association.py,sha256=4rpf8PbafCYCfNJGISAmnpfcvJZTo_jPDGm2M-BuiPk,878
 zwave_js_server/model/command_class.py,sha256=SDTyGKlz5tDUoBb4RgKwPGwPuJvZ77a_q2EllN4bnzU,1394
 zwave_js_server/model/device_class.py,sha256=WTeYuR9PoIMzfjNhE21XIlHoTA9yDNEuRPkFS1W6nts,1609
-zwave_js_server/model/device_config.py,sha256=HpM-DchbhcyjhkDrp-6b8YaX2Qqo7KZbWk60xcMIhFY,6562
+zwave_js_server/model/device_config.py,sha256=ANKQLGpXYAk6ibZTr6zRQEj6i70sby7ctsRN1XwYjc4,6525
 zwave_js_server/model/duration.py,sha256=OW2OqReexL6GXxxLs__i5Vs3JCVoODgLpwPHU48yynU,1153
 zwave_js_server/model/endpoint.py,sha256=V_OWg4PLwExOSdY4cAiY5IkiJ2FH5MHF3tKG8O0X1Lo,11911
 zwave_js_server/model/log_config.py,sha256=uF7gJlr2dSBP2mBMYzOyFiV_T45PwGU98AM5c7qs2g0,1574
@@ -40,23 +40,23 @@ zwave_js_server/model/log_message.py,sha256=SNicnss7LUZd6woMecNQ0ZKwghC9OmxNdA1v
 zwave_js_server/model/notification.py,sha256=-M9MZ1RUWmUCHuIU_So6h5sYhMILKxntGx3zBkKaqeo,6165
 zwave_js_server/model/statistics.py,sha256=in7S8oxWlG38tCEz1k3lxLjEsfY5yfsnD0bolcEeuHg,3233
 zwave_js_server/model/utils.py,sha256=VMoJQ99QRkpJleJhXR4eojbgObdZZeEfse5gonmK7Ic,1157
-zwave_js_server/model/value.py,sha256=Ku_VnX79WL82SD6Up01qQUNRldnCvi37HeEuTrTdBPU,13266
+zwave_js_server/model/value.py,sha256=aHiWfmFym8t5aok2uxQoVHw375wbv-frNjAMAs6MSMg,13273
 zwave_js_server/model/version.py,sha256=EnyL6O8r2gSv7qLIuZ-sWnybG5JnJWw-IEE5UtIUjiM,1272
 zwave_js_server/model/config_manager/__init__.py,sha256=g1qEnadcfG7P8AJrUjxTeke9OBaKFiLVelgTQQJRMx4,1246
-zwave_js_server/model/controller/__init__.py,sha256=iIpxFeyPhsredhh8fMKc2y4TWCIU12F4dPFSylMVMP4,37130
+zwave_js_server/model/controller/__init__.py,sha256=d2htuMJhnwF9CdcaIK7sRExDJ1ljH6ypsKOk5mu6k4M,37378
 zwave_js_server/model/controller/data_model.py,sha256=5e6M0t7RkSJytovmDz1tULMFFoCQ1TsGHe56scrZRqI,851
 zwave_js_server/model/controller/event_model.py,sha256=BtacPbezXVByd9kuMSHysywLP3eCz5VgTdWs2NmA65M,9518
 zwave_js_server/model/controller/inclusion_and_provisioning.py,sha256=PAO5HQE_yyTMxoVN3Woth1qC_oL6EzJNJ7NEvMtpBEA,7667
 zwave_js_server/model/controller/rebuild_routes.py,sha256=ElAZdSLiDaQLbGgfJQMnuilTpsSbCz3qag3lFBt2JoM,1073
-zwave_js_server/model/controller/statistics.py,sha256=iU2wiRvWvHzYGwydOqs8Y7CBdKA3DgL6tI1NW1zBTfU,4672
-zwave_js_server/model/driver/__init__.py,sha256=VMqZAdbIq4h-udwTvLfQR1zyxA3QEoAojfkgMNwz6Lg,9275
+zwave_js_server/model/controller/statistics.py,sha256=s1wg-npEtXp-2yprych8BuQfG1NHq0fAZypqFz2T8hI,4954
+zwave_js_server/model/driver/__init__.py,sha256=JyXBTqSg77FsGZXw2_cxLe0ICZHmxukpPPQrHfjqZrg,9390
 zwave_js_server/model/driver/firmware.py,sha256=pWSI6QYt4mJ-ff3Wd4Hyc3r-MeiJPkaAz24lFcz40Vs,2815
 zwave_js_server/model/node/__init__.py,sha256=OeHGrrjzsviGXWRv6HrLTlw70pmAagP6NwiRQACNxrE,41489
 zwave_js_server/model/node/data_model.py,sha256=lhCUcOkJ-PYAJ6ItnDwX4WkrBCMHZTDtSerf3YAdbEE,1872
-zwave_js_server/model/node/event_model.py,sha256=mSRqCIBt6LXvCmMaOGmWz_cLrfPqot_ScZLmVr_z2w4,10055
+zwave_js_server/model/node/event_model.py,sha256=Xx_4U6HVsw1j4Hpt63CrxX4JtiVSVf9e-opaP0grZDk,10002
 zwave_js_server/model/node/firmware.py,sha256=jF1CrI6hnETj8oZsXuwQVnIkTJ9qQ8uJEdY7JAthpC0,10214
 zwave_js_server/model/node/health_check.py,sha256=GuDFPfk5BL7aK4q5aEtGcpyZz_F-aLEIGeVw_4shq5E,5341
-zwave_js_server/model/node/statistics.py,sha256=f8JElpXEtT7y9cLhH6UhOGVwrGprtfL5GQX1VIKAGcQ,2871
+zwave_js_server/model/node/statistics.py,sha256=PkD_vsOcT_6Iwwlqy5ISBZRXFQ-alTOZwIpatRg0PFQ,2875
 zwave_js_server/util/__init__.py,sha256=ArF1K885aW0GdVd7Lo8fl8Atf70gvsxO5Ra_WoJTG28,42
 zwave_js_server/util/helpers.py,sha256=BNEaa5xSGlFwJrIIWt-Ne8BdHFOdcUnZOhZ-nsfDk2c,1638
 zwave_js_server/util/lock.py,sha256=QKl6BuzDhIP25HBB0Ba9Fl6drARXnyqV3u5ywQl0Te8,7422
@@ -66,9 +66,9 @@ zwave_js_server/util/command_class/__init__.py,sha256=sRxti47ekLTzfk8B609CMQumIb
 zwave_js_server/util/command_class/energy_production.py,sha256=K1VmGDlqXmKDfQRpTu5o99sjnDShBMV_crEb49o-O_4,1489
 zwave_js_server/util/command_class/meter.py,sha256=tJ7rbwWUZbJCS7xEJWS_KnqUUGR8RN0f2S8iLkufae0,1258
 zwave_js_server/util/command_class/multilevel_sensor.py,sha256=wG4GQ0kjrP6d3x5DpEkUHrZd8-0LbvXoYdIxZAf6bso,1427
-zwave_js_server_python-0.64.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-zwave_js_server_python-0.64.0.dist-info/METADATA,sha256=JQb47TZYIr0rpJg_5VotGDyghTPJrf9C1QQNyxVaxDs,1927
-zwave_js_server_python-0.64.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zwave_js_server_python-0.64.0.dist-info/entry_points.txt,sha256=lvzma7Rd_3FW_k-_xGuTfpvcvA2MR_22DOz5f1t7-xg,73
-zwave_js_server_python-0.64.0.dist-info/top_level.txt,sha256=-hwsl-i4Av5Op_yfOHC_OP56KPmzp_iVEkeohRIN5Ng,16
-zwave_js_server_python-0.64.0.dist-info/RECORD,,
+zwave_js_server_python-0.66.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+zwave_js_server_python-0.66.0.dist-info/METADATA,sha256=qyZN26WKUNlgK7M0o1CzFHHu7j26neqsP7trli2TseU,1992
+zwave_js_server_python-0.66.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zwave_js_server_python-0.66.0.dist-info/entry_points.txt,sha256=lvzma7Rd_3FW_k-_xGuTfpvcvA2MR_22DOz5f1t7-xg,73
+zwave_js_server_python-0.66.0.dist-info/top_level.txt,sha256=-hwsl-i4Av5Op_yfOHC_OP56KPmzp_iVEkeohRIN5Ng,16
+zwave_js_server_python-0.66.0.dist-info/RECORD,,