smpclient 3.2.0__tar.gz → 3.2.1__tar.gz

{smpclient-3.2.0 → smpclient-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smpclient
-Version: 3.2.0
+Version: 3.2.1
 Summary: Simple Management Protocol (SMP) Client for remotely managing MCU firmware
 License: Apache-2.0
 Author: J.P. Hutchins
@@ -16,7 +16,7 @@ Requires-Dist: async-timeout (>=4.0.3,<5.0.0) ; python_version < "3.11"
 Requires-Dist: bleak (>=0.22.1,<0.23.0)
 Requires-Dist: intelhex (>=2.3.0,<3.0.0)
 Requires-Dist: pyserial (>=3.5,<4.0)
-Requires-Dist: smp (>=1.0.3,<2.0.0)
+Requires-Dist: smp (>=2.0.0,<3.0.0)
 Description-Content-Type: text/markdown
 
 # Simple Management Protocol (SMP) Client 

{smpclient-3.2.0 → smpclient-3.2.1}/pyproject.toml

@@ -21,7 +21,7 @@ source = "git-tag"
 [tool.poetry.dependencies]
 python = ">=3.8.1, <3.13"
 pyserial = "^3.5"
-smp = "^1.0.3"
+smp = "^2.0.0"
 intelhex = "^2.3.0"
 bleak = "^0.22.1"
 async-timeout = { version = "^4.0.3", python = "<3.11" }

{smpclient-3.2.0 → smpclient-3.2.1}/smpclient/__init__.py

@@ -145,6 +145,15 @@ class SMPClient:
             else:  # pragma: no cover
                 raise Exception("Unreachable")
 
+        logger.info("Upload complete")
+
+        if response.match is not None:
+            logger.info(f"Server reports {response.match=}")
+            if response.match is not True:
+                message: Final = f"Upload failed, server reported mismatched SHA256: {response}"
+                logger.error(message)
+                raise SMPUploadError(message)
+
     @property
     def address(self) -> str:
         return self._address

{smpclient-3.2.0 → smpclient-3.2.1}/smpclient/requests/image_management.py

@@ -15,7 +15,7 @@ class ImageStatesWrite(smpimg.ImageStatesWriteRequest, _ImageGroupBase):
 
 
 class ImageUploadWrite(smpimg.ImageUploadWriteRequest, _ImageGroupBase):
-    _Response = smpimg.ImageUploadProgressWriteResponse
+    _Response = smpimg.ImageUploadWriteResponse
 
 
 class ImageErase(smpimg.ImageEraseRequest, _ImageGroupBase):

{smpclient-3.2.0 → smpclient-3.2.1}/smpclient/transport/ble.py

@@ -4,10 +4,9 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import platform
 import re
 import sys
-from typing import Final, List
+from typing import Final, List, Protocol
 from uuid import UUID
 
 from bleak import BleakClient, BleakGATTCharacteristic, BleakScanner
@@ -23,11 +22,24 @@ if sys.platform == "linux":
     from bleak.backends.bluezdbus.client import BleakClientBlueZDBus
 else:  # stub for mypy
 
-    class BleakClientBlueZDBus:
+    class BleakClientBlueZDBus(Protocol):
         async def _acquire_mtu(self) -> None:
             ...
 
 
+if sys.platform == "win32":
+    from bleak.backends.winrt.client import BleakClientWinRT
+else:  # stub for mypy
+
+    class GattSession(Protocol):
+        max_pdu_size: int
+
+    class BleakClientWinRT(Protocol):
+        @property
+        def _session(self) -> GattSession:
+            ...
+
+
 SMP_SERVICE_UUID: Final = UUID("8D53DC1D-1DB7-4CD3-868B-8A527460AA84")
 SMP_CHARACTERISTIC_UUID: Final = UUID("DA2E7828-FBCE-4E01-AE9E-261174997C48")
 
@@ -95,7 +107,10 @@ class SMPBLETransport(SMPTransport):
         logger.debug(f"Found SMP characteristic: {smp_characteristic=}")
         logger.info(f"{smp_characteristic.max_write_without_response_size=}")
         self._max_write_without_response_size = smp_characteristic.max_write_without_response_size
-        if platform.system() == "Windows" and self._max_write_without_response_size == 20:
+        if (
+            self._winrt_backend(self._client._backend)
+            and self._max_write_without_response_size == 20
+        ):
             # https://github.com/hbldh/bleak/pull/1552#issuecomment-2105573291
             logger.warning(
                 "The SMP characteristic MTU is 20 bytes, possibly a Windows bug, checking again"
@@ -201,6 +216,10 @@ class SMPBLETransport(SMPTransport):
     def _bluez_backend(client_backend: BaseBleakClient) -> TypeGuard[BleakClientBlueZDBus]:
         return client_backend.__class__.__name__ == "BleakClientBlueZDBus"
 
+    @staticmethod
+    def _winrt_backend(client_backend: BaseBleakClient) -> TypeGuard[BleakClientWinRT]:
+        return client_backend.__class__.__name__ == "BleakClientWinRT"
+
     def _set_disconnected_event(self, client: BleakClient) -> None:
         if client is not self._client:
             raise SMPBLETransportException(