Fix mypy type errors for zigpy 0.91.2 compatibility

Co-authored-by: puddly <32534428+puddly@users.noreply.github.com>

Author: Copilot

tests/application/test_requests.py

@@ -773,7 +773,7 @@ async def test_send_security_and_packet_source_route(device, make_application, m
         tx_options=(
             zigpy_t.TransmitOptions.ACK | zigpy_t.TransmitOptions.APS_Encryption
         ),
-        source_route=[0xAABB, 0xCCDD],
+        source_route=[zigpy_t.NWK(0xAABB), zigpy_t.NWK(0xCCDD)],
     )
 
     data_req = znp_server.reply_once_to(

tests/application/test_startup.py

@@ -25,7 +25,7 @@
         "CC2652",
         f"Z-Stack {FormedLaunchpadCC26X2R1.code_revision}",
         15,
-        t.Channels.from_channel_list([15]),
+        t.Channels.from_channel_list([15]),  # type: ignore[misc]
         0x4402,
         t.EUI64.convert("A2:BA:38:A8:B5:E6:83:A0"),
         t.KeyData.convert("4C:4E:72:B8:41:22:51:79:9A:BF:35:25:12:88:CA:83"),
@@ -34,7 +34,7 @@
         "CC2531",
         f"Z-Stack 3.0.x {FormedZStack3CC2531.code_revision}",
         15,
-        t.Channels.from_channel_list([15]),
+        t.Channels.from_channel_list([15]),  # type: ignore[misc]
         0xB6AB,
         t.EUI64.convert("62:92:32:46:3C:77:2D:B2"),
         t.KeyData.convert("6D:DE:24:EA:E2:85:52:B6:DE:29:56:EB:05:85:1A:FA"),
@@ -43,7 +43,7 @@
         "CC2531",
         f"Z-Stack Home 1.2 {FormedZStack1CC2531.code_revision}",
         11,
-        t.Channels.from_channel_list([11]),
+        t.Channels.from_channel_list([11]),  # type: ignore[misc]
         0x1A62,
         t.EUI64.convert("DD:DD:DD:DD:DD:DD:DD:DD"),
         t.KeyData([1, 3, 5, 7, 9, 11, 13, 15, 0, 2, 4, 6, 8, 10, 12, 13]),

tests/application/test_zdo_requests.py

@@ -56,7 +56,7 @@ async def update_channel(req):
         request=c.ZDO.MgmtNWKUpdateReq.Req(
             Dst=0x0000,
             DstAddrMode=t.AddrMode.NWK,
-            Channels=t.Channels.from_channel_list([new_channel]),
+            Channels=t.Channels.from_channel_list([new_channel]),  # type: ignore[misc]
             ScanDuration=254,
             # Missing fields in the request cannot be `None` in the Z-Stack command
             ScanCount=0,

tests/test_commands.py

@@ -335,7 +335,7 @@ def test_command_optional_params_failures():
 
 
 def test_simple_descriptor():
-    lvlist16_type = zigpy_t.LVList[t.uint16_t]
+    lvlist16_type = zigpy_t.LVList[zigpy_t.uint8_t, t.uint16_t]
 
     simple_descriptor = zigpy.zdo.types.SimpleDescriptor()
     simple_descriptor.endpoint = zigpy_t.uint8_t(1)

tests/tools/test_network_backup_restore.py

@@ -182,7 +182,7 @@ async def test_network_backup_formed(device, make_znp_server, tmp_path):
     assert backup["nwk_update_id"] == 0
     assert backup["security_level"] == 5
     assert backup["channel"] == channel
-    assert t.Channels.from_channel_list(backup["channel_mask"]) == channels
+    assert t.Channels.from_channel_list(backup["channel_mask"]) == channels  # type: ignore[misc]
 
     assert t.KeyData(bytes.fromhex(backup["network_key"]["key"])) == network_key
     assert backup["network_key"]["sequence_number"] == 0

zigpy_znp/const.py

@@ -25,4 +25,4 @@
 )
 
 # Used only when creating a temporary network during formation
-STARTUP_CHANNELS = t.Channels.from_channel_list([15, 20, 25])
+STARTUP_CHANNELS = t.Channels.from_channel_list([15, 20, 25])  # type: ignore[misc]

zigpy_znp/tools/network_restore.py

@@ -36,7 +36,7 @@ def json_backup_to_zigpy_state(
     network_info.nwk_update_id = backup["nwk_update_id"]
     network_info.nwk_manager_id = 0x0000
     network_info.channel = backup["channel"]
-    network_info.channel_mask = t.Channels.from_channel_list(backup["channel_mask"])
+    network_info.channel_mask = t.Channels.from_channel_list(backup["channel_mask"])  # type: ignore[misc]
     network_info.security_level = backup["security_level"]
     network_info.stack_specific = backup.get("stack_specific")
     network_info.tc_link_key = zigpy.state.Key()

zigpy_znp/tools/network_scan.py

@@ -106,7 +106,7 @@ async def main(argv):
         "-c",
         "--channels",
         dest="channels",
-        type=lambda s: t.Channels.from_channel_list(map(int, s.split(","))),
+        type=lambda s: t.Channels.from_channel_list(map(int, s.split(","))),  # type: ignore[misc]
         default=t.Channels.ALL_CHANNELS,
         help="Channels on which to scan for networks",
     )

zigpy_znp/uart.py

@@ -31,7 +31,7 @@ def close(self) -> None:
         super().close()
         self._api = None
 
-    def connection_lost(self, exc: Exception | None) -> None:
+    def connection_lost(self, exc: BaseException | None) -> None:
         """Connection lost."""
         super().connection_lost(exc)
 
@@ -155,4 +155,4 @@ async def connect(config: conf.ConfigType, api) -> ZnpMtProtocol:
 
     await protocol.wait_until_connected()
 
-    return protocol
+    return protocol  # type: ignore[return-value]

zigpy_znp/zigbee/application.py

@@ -173,7 +173,9 @@ async def start_network(self, *, read_only=False):
         self.devices[self.state.node_info.ieee] = ZNPCoordinator(
             self, self.state.node_info.ieee, self.state.node_info.nwk
         )
-        await self._device.schedule_initialize()
+        task = self._device.schedule_initialize()
+        if task is not None:
+            await task
 
         # Deprecate ZNP-specific config
         if self.znp_config[conf.CONF_MAX_CONCURRENT_REQUESTS] is not None:
@@ -199,7 +201,7 @@ async def start_network(self, *, read_only=False):
                 "Your network is using the insecure Zigbee2MQTT network key!"
             )
 
-    async def set_tx_power(self, dbm: int) -> None:
+    async def set_tx_power(self, dbm: float) -> None:
         """
         Sets the radio TX power.
         """
@@ -237,7 +239,7 @@ def get_dst_address(self, cluster: zigpy.zcl.Cluster) -> zdo_t.MultiAddress:
 
         return dst_addr
 
-    async def permit(self, time_s: int = 60, node: t.EUI64 = None):
+    async def permit(self, time_s: int = 60, node: t.EUI64 | str | None = None):
         """
         Permit joining the network via a specific node or via all router nodes.
         """
@@ -273,7 +275,7 @@ async def permit(self, time_s: int = 60, node: t.EUI64 = None):
 
         await super().permit(time_s=time_s, node=node)
 
-    async def permit_ncp(self, time_s: int) -> None:
+    async def permit_ncp(self, time_s: int = 60) -> None:
         """
         Permits joins only on the coordinator.
         """
@@ -334,7 +336,7 @@ async def _move_network_to_channel(
             request=c.ZDO.MgmtNWKUpdateReq.Req(
                 Dst=0x0000,
                 DstAddrMode=t.AddrMode.NWK,
-                Channels=t.Channels.from_channel_list([new_channel]),
+                Channels=t.Channels.from_channel_list([new_channel]),  # type: ignore[misc]
                 ScanDuration=zdo_t.NwkUpdate.CHANNEL_CHANGE_REQ,
                 ScanCount=0,
                 NwkManagerAddr=0x0000,