zwave-js-server-python 0.55.4__tar.gz → 0.57.0__tar.gz

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zwave-js-server-python
-Version: 0.55.4
+Version: 0.57.0
 Summary: Python wrapper for zwave-js-server
 Author-email: Home Assistant Team <hello@home-assistant.io>
 License:                                  Apache License
@@ -212,9 +212,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Home Automation
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>3

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "zwave-js-server-python"
 authors = [{ name = "Home Assistant Team", email = "hello@home-assistant.io" }]
 description = "Python wrapper for zwave-js-server"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 license = { file = "LICENSE" }
 keywords = ["home", "automation", "zwave", "zwave-js"]
 classifiers = [
@@ -15,7 +15,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Home Automation",
 ]
 dependencies = ["aiohttp>3", "pydantic>=1.10.0"]

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.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.55.4"
+__version__ = "0.57.0"
 
 # minimal server schema version we can handle
-MIN_SERVER_SCHEMA_VERSION = 33
+MIN_SERVER_SCHEMA_VERSION = 36
 # max server schema version we can handle (and our code is compatible with)
-MAX_SERVER_SCHEMA_VERSION = 34
+MAX_SERVER_SCHEMA_VERSION = 36
 
 VALUE_UNKNOWN = "unknown"
 

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/const/command_class/meter.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from enum import IntEnum
 
 VALUE_PROPERTY = "value"
+RESET_PROPERTY = "reset"
 
 CC_SPECIFIC_SCALE = "scale"
 CC_SPECIFIC_METER_TYPE = "meterType"

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/controller/__init__.py

@@ -244,6 +244,11 @@ class Controller(EventBase):
         """Return status."""
         return ControllerStatus(self.data["status"])
 
+    @property
+    def supports_long_range(self) -> bool | None:
+        """Return whether controller supports long range or not."""
+        return self.data.get("supportsLongRange")
+
     def update(self, data: ControllerDataType) -> None:
         """Update controller data."""
         self.data = data

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/controller/data_model.py

@@ -33,3 +33,4 @@ class ControllerDataType(TypedDict, total=False):
     rfRegion: int
     status: int
     rebuildRoutesProgress: dict[str, str]
+    supportsLongRange: bool

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/controller/inclusion_and_provisioning.py

@@ -49,6 +49,7 @@ class ProvisioningEntry:
     security_classes: list[SecurityClass]
     requested_security_classes: list[SecurityClass] | None = None
     status: ProvisioningEntryStatus = ProvisioningEntryStatus.ACTIVE
+    protocol: Protocols | None = None
     additional_properties: dict[str, Any] | None = None
 
     def to_dict(self) -> dict[str, Any]:
@@ -63,6 +64,8 @@ class ProvisioningEntry:
             data["requestedSecurityClasses"] = [
                 sec_cls.value for sec_cls in self.requested_security_classes
             ]
+        if self.protocol is not None:
+            data["protocol"] = self.protocol.value
         return data
 
     @classmethod
@@ -73,19 +76,21 @@ class ProvisioningEntry:
             security_classes=[
                 SecurityClass(sec_cls) for sec_cls in data["securityClasses"]
             ],
-            additional_properties={
-                k: v
-                for k, v in data.items()
-                if k
-                not in {"dsk", "securityClasses", "requestedSecurityClasses", "status"}
-            },
         )
+        if additional_properties := {
+            k: v
+            for k, v in data.items()
+            if k not in ("dsk", "securityClasses", "requestedSecurityClasses", "status")
+        }:
+            cls_instance.additional_properties = additional_properties
         if "requestedSecurityClasses" in data:
             cls_instance.requested_security_classes = [
                 SecurityClass(sec_cls) for sec_cls in data["requestedSecurityClasses"]
             ]
         if "status" in data:
             cls_instance.status = ProvisioningEntryStatus(data["status"])
+        if "protocol" in data:
+            cls_instance.protocol = Protocols(data["protocol"])
         return cls_instance
 
 
@@ -143,6 +148,12 @@ class QRProvisioningInformation(ProvisioningEntry, QRProvisioningInformationMixi
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> QRProvisioningInformation:
         """Return QRProvisioningInformation from data dict."""
+        supported_protocols: list[Protocols] | None = None
+        if "supportedProtocols" in data:
+            supported_protocols = [
+                Protocols(supported_protocol)
+                for supported_protocol in data["supportedProtocols"]
+            ]
         cls_instance = cls(
             version=QRCodeVersion(data["version"]),
             security_classes=[
@@ -158,33 +169,31 @@ class QRProvisioningInformation(ProvisioningEntry, QRProvisioningInformationMixi
             application_version=data["applicationVersion"],
             max_inclusion_request_interval=data.get("maxInclusionRequestInterval"),
             uuid=data.get("uuid"),
-            supported_protocols=[
-                Protocols(supported_protocol)
-                for supported_protocol in data.get("supportedProtocols", [])
-            ],
-            additional_properties={
-                k: v
-                for k, v in data.items()
-                if k
-                not in {
-                    "version",
-                    "securityClasses",
-                    "requestedSecurityClasses",
-                    "dsk",
-                    "genericDeviceClass",
-                    "specificDeviceClass",
-                    "installerIconType",
-                    "manufacturerId",
-                    "productType",
-                    "productId",
-                    "applicationVersion",
-                    "maxInclusionRequestInterval",
-                    "uuid",
-                    "supportedProtocols",
-                    "status",
-                }
-            },
+            supported_protocols=supported_protocols,
         )
+        if additional_properties := {
+            k: v
+            for k, v in data.items()
+            if k
+            not in (
+                "version",
+                "securityClasses",
+                "requestedSecurityClasses",
+                "dsk",
+                "genericDeviceClass",
+                "specificDeviceClass",
+                "installerIconType",
+                "manufacturerId",
+                "productType",
+                "productId",
+                "applicationVersion",
+                "maxInclusionRequestInterval",
+                "uuid",
+                "supportedProtocols",
+                "status",
+            )
+        }:
+            cls_instance.additional_properties = additional_properties
         if "requestedSecurityClasses" in data:
             cls_instance.requested_security_classes = [
                 SecurityClass(sec_cls) for sec_cls in data["requestedSecurityClasses"]

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/device_class.py

@@ -23,8 +23,6 @@ class DeviceClassDataType(TypedDict):
     basic: DeviceClassItemDataType
     generic: DeviceClassItemDataType
     specific: DeviceClassItemDataType
-    mandatorySupportedCCs: list[int]
-    mandatoryControlledCCs: list[int]
 
 
 @dataclass
@@ -43,8 +41,6 @@ class DeviceClass:
         self._basic = DeviceClassItem(**data["basic"])
         self._generic = DeviceClassItem(**data["generic"])
         self._specific = DeviceClassItem(**data["specific"])
-        self._mandatory_supported_ccs: list[int] = data["mandatorySupportedCCs"]
-        self._mandatory_controlled_ccs: list[int] = data["mandatoryControlledCCs"]
 
     @property
     def basic(self) -> DeviceClassItem:
@@ -60,13 +56,3 @@ class DeviceClass:
     def specific(self) -> DeviceClassItem:
         """Return specific DeviceClass."""
         return self._specific
-
-    @property
-    def mandatory_supported_ccs(self) -> list[int]:
-        """Return list of mandatory Supported CC id's."""
-        return self._mandatory_supported_ccs
-
-    @property
-    def mandatory_controlled_ccs(self) -> list[int]:
-        """Return list of mandatory Controlled CC id's."""
-        return self._mandatory_controlled_ccs

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/node/__init__.py

@@ -15,15 +15,11 @@ from ...const import (
     DateAndTime,
     NodeStatus,
     PowerLevel,
+    Protocols,
     SecurityClass,
 )
 from ...event import Event, EventBase
-from ...exceptions import (
-    FailedCommand,
-    NotFoundError,
-    UnparseableValue,
-    UnwriteableValue,
-)
+from ...exceptions import NotFoundError, UnparseableValue, UnwriteableValue
 from ..command_class import CommandClassInfo
 from ..device_class import DeviceClass
 from ..device_config import DeviceConfig
@@ -49,7 +45,6 @@ from ..value import (
     ValueMetadata,
     ValueNotification,
     _get_value_id_str_from_dict,
-    _init_value,
 )
 from .data_model import NodeDataType
 from .event_model import NODE_EVENT_MODEL_MAP
@@ -138,6 +133,12 @@ class Node(EventBase):
             self.client.driver == other.client.driver and self.node_id == other.node_id
         )
 
+    def _init_value(self, val: ValueDataType) -> Value | ConfigurationValue:
+        """Initialize a Value object from ValueDataType."""
+        if val["commandClass"] == CommandClass.CONFIGURATION:
+            return ConfigurationValue(self, val)
+        return Value(self, val)
+
     @property
     def node_id(self) -> int:
         """Return node ID property."""
@@ -371,6 +372,13 @@ class Node(EventBase):
         """Return the default transition duration."""
         return self.data.get("defaultTransitionDuration")
 
+    @property
+    def protocol(self) -> Protocols | None:
+        """Return the protocol used to communicate with this node."""
+        if "protocol" in self.data:
+            return Protocols(self.data["protocol"])
+        return None
+
     def _update_endpoints(self, endpoints: list[EndpointDataType]) -> None:
         """Update the endpoints data."""
         new_endpoints_data = {endpoint["index"]: endpoint for endpoint in endpoints}
@@ -421,7 +429,7 @@ class Node(EventBase):
                 if value_id in self.values:
                     self.values[value_id].update(val)
                 else:
-                    self.values[value_id] = _init_value(self, val)
+                    self.values[value_id] = self._init_value(val)
             except UnparseableValue:
                 # If we can't parse the value, don't store it
                 pass
@@ -440,8 +448,9 @@ class Node(EventBase):
         )
         if last_seen := data.get("lastSeen"):
             self._last_seen = datetime.fromisoformat(last_seen)
-        if not self._statistics.last_seen:
+        if not self._statistics.last_seen and self.last_seen:
             self._statistics.last_seen = self.last_seen
+            self._statistics.data["lastSeen"] = self.last_seen.isoformat()
 
         self._update_values(self.data.pop("values"))
         self._update_endpoints(self.data.pop("endpoints"))
@@ -585,12 +594,9 @@ class Node(EventBase):
         data = await self.async_send_command(
             "get_defined_value_ids", wait_for_result=True
         )
-
-        if data is None:
-            # We should never reach this code
-            raise FailedCommand("Command failed", "failed_command")
+        assert data
         return [
-            _init_value(self, cast(ValueDataType, value_id))
+            self._init_value(cast(ValueDataType, value_id))
             for value_id in data["valueIds"]
         ]
 
@@ -1053,7 +1059,7 @@ class Node(EventBase):
         value_id = _get_value_id_str_from_dict(self, evt_val_data)
         value = self.values.get(value_id)
         if value is None:
-            value = _init_value(self, evt_val_data)
+            value = self._init_value(evt_val_data)
             self.values[value.value_id] = event.data["value"] = value
         else:
             value.receive_event(event)

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/node/data_model.py

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

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server/model/value.py

@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING, Any, TypedDict
 
 from ..const import (
     VALUE_UNKNOWN,
-    CommandClass,
     CommandStatus,
     ConfigurationValueType,
     SetValueStatus,
@@ -75,13 +74,6 @@ class ValueDataType(TypedDict, total=False):
     ccVersion: int  # required
 
 
-def _init_value(node: Node, val: ValueDataType) -> Value | ConfigurationValue:
-    """Initialize a Value object from ValueDataType."""
-    if val["commandClass"] == CommandClass.CONFIGURATION:
-        return ConfigurationValue(node, val)
-    return Value(node, val)
-
-
 def _get_value_id_str_from_dict(node: Node, val: ValueDataType) -> str:
     """Return string ID of value from ValueDataType dict."""
     return get_value_id_str(

{zwave_js_server_python-0.55.4 → zwave_js_server_python-0.57.0}/zwave_js_server_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zwave-js-server-python
-Version: 0.55.4
+Version: 0.57.0
 Summary: Python wrapper for zwave-js-server
 Author-email: Home Assistant Team <hello@home-assistant.io>
 License:                                  Apache License
@@ -212,9 +212,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Home Automation
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>3