zwave-js-server-python 0.65.0__tar.gz → 0.66.0__tar.gz

{zwave_js_server_python-0.65.0/zwave_js_server_python.egg-info → zwave_js_server_python-0.66.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwave-js-server-python
-Version: 0.65.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.65.0 → zwave_js_server_python-0.66.0}/pyproject.toml

@@ -19,7 +19,11 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     "Topic :: Home Automation",
 ]
-dependencies = ["aiohttp>3", "pydantic>=1.10.0"]
+dependencies = [
+    "aiohttp>3",
+    "pydantic>=2.0.0",
+    "typing_extensions>=4.13.0;python_version<'3.14'",
+]
 dynamic = ["version"]
 
 [project.urls]

{zwave_js_server_python-0.65.0 → zwave_js_server_python-0.66.0}/zwave_js_server/const/__init__.py

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

{zwave_js_server_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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_python-0.65.0 → zwave_js_server_python-0.66.0}/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.65.0 → zwave_js_server_python-0.66.0/zwave_js_server_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zwave-js-server-python
-Version: 0.65.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.66.0/zwave_js_server_python.egg-info/requires.txt

@@ -0,0 +1,5 @@
+aiohttp>3
+pydantic>=2.0.0
+
+[:python_version < "3.14"]
+typing_extensions>=4.13.0

zwave_js_server_python-0.65.0/zwave_js_server_python.egg-info/requires.txt

@@ -1,2 +0,0 @@
-aiohttp>3
-pydantic>=1.10.0