python-ember-mug 1.3.2__tar.gz → 1.4.0b1__tar.gz

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.3.2
+Version: 1.4.0b1
 Summary: Python Library for Ember Mugs.
 Project-URL: Changelog, https://sopelj.github.io/python-ember-mug/changelog/
 Project-URL: Documentation, https://sopelj.github.io/python-ember-mug/
@@ -19,11 +19,11 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.11
 Requires-Dist: bleak-retry-connector>=4.0.2
-Requires-Dist: bleak<2.2.0,>=1.0.1
+Requires-Dist: bleak>=1.0.1
 Provides-Extra: dev
 Requires-Dist: ipython; extra == 'dev'
 Provides-Extra: docs
-Requires-Dist: black; extra == 'docs'
+Requires-Dist: black>=26.3.1; extra == 'docs'
 Requires-Dist: mkdocs-autorefs; extra == 'docs'
 Requires-Dist: mkdocs-gen-files; extra == 'docs'
 Requires-Dist: mkdocs-include-markdown-plugin<8.0.0,>=7.0.0; extra == 'docs'

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/ember_mug/__init__.py

@@ -6,4 +6,4 @@ __all__ = ("EmberMug",)
 
 __author__ = """Jesse Sopel"""
 __email__ = "jesse@sopelj.ca"
-__version__ = "1.3.2"
+__version__ = "1.4.0b1"

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/ember_mug/cli/commands.py

@@ -10,13 +10,14 @@ import sys
 from argparse import ArgumentParser, ArgumentTypeError, FileType, Namespace
 from typing import TYPE_CHECKING, ClassVar
 
-from bleak import AdvertisementData, BleakError
+from bleak import BleakError
 
 from ember_mug.consts import ATTR_LABELS, EMBER_BLE_SIG, EXTRA_ATTRS, IS_LINUX, TESTING_BLE_SIG, VolumeLevel
 from ember_mug.data import Colour, DeviceModel
 from ember_mug.mug import EmberMug
 from ember_mug.scanner import discover_devices, find_device
 
+from .. import __version__
 from ..formatting import format_capacity
 from ..utils import get_model_info_from_advertiser_data
 from .helpers import CommandLoop, print_changes, print_info, print_table, validate_mac
@@ -24,6 +25,7 @@ from .helpers import CommandLoop, print_changes, print_info, print_table, valida
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
 
+    from bleak import AdvertisementData
     from bleak.backends.device import BLEDevice
 
 all_attrs = list(ATTR_LABELS) + list(EXTRA_ATTRS)
@@ -206,19 +208,20 @@ class EmberMugCli:
             type=validate_mac,
             help="Only look for this specific address",
         )
-        shared_parser.add_argument(
+        self.parser.add_argument(
             "-d",
             "--debug",
             action="store_true",
             help="Print extra information for development or debugging issues",
         )
-        shared_parser.add_argument(
+        self.parser.add_argument(
             "--log-file",
             type=FileType("w", encoding="utf-8"),
             nargs="?",
             default=sys.stdout,
             help="File to write logs too (Will be overwritten)",
         )
+        self.parser.add_argument("--version", action="version", version=__version__)
         shared_parser.add_argument("-r", "--raw", help="No formatting. One value per line.", action="store_true")
         if IS_LINUX is True:
             # Only works on Linux with BlueZ so don't add for others.

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/ember_mug/data.py

@@ -206,7 +206,7 @@ class MugMeta(AsDict):
 
 
 @dataclass
-class MugData(AsDict):
+class MugData:
     """Class to store/display the state of the mug."""
 
     # Options

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/ember_mug/mug.py

@@ -41,7 +41,7 @@ from .utils import (
 )
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncIterator, Awaitable, Callable
+    from collections.abc import AsyncGenerator, Awaitable, Callable
 
     from bleak.backends.characteristic import BleakGATTCharacteristic
     from bleak.backends.device import BLEDevice
@@ -266,11 +266,11 @@ class EmberMug:
 
     async def get_meta(self) -> MugMeta:
         """Fetch Meta info from the mug (Serial number and ID)."""
-        return MugMeta.from_bytes(await self._read(MugCharacteristic.MUG_ID))
+        return MugMeta.from_bytes(bytes(await self._read(MugCharacteristic.MUG_ID)))
 
     async def get_battery(self) -> BatteryInfo:
         """Get Battery percent from mug gatt."""
-        return BatteryInfo.from_bytes(await self._read(MugCharacteristic.BATTERY))
+        return BatteryInfo.from_bytes(bytes(await self._read(MugCharacteristic.BATTERY)))
 
     async def make_writable(self) -> bool:
         """Try to make device writable if need be."""
@@ -419,7 +419,7 @@ class EmberMug:
 
     async def get_firmware(self) -> MugFirmwareInfo:
         """Get firmware info."""
-        return MugFirmwareInfo.from_bytes(await self._read(MugCharacteristic.FIRMWARE))
+        return MugFirmwareInfo.from_bytes(bytes(await self._read(MugCharacteristic.FIRMWARE)))
 
     async def update_initial(self) -> list[Change]:
         """Update attributes that don't normally change and don't need to be regularly updated."""
@@ -525,7 +525,7 @@ class EmberMug:
         self._client_kwargs = {**kwargs}
 
     @contextlib.asynccontextmanager
-    async def connection(self, **kwargs: str) -> AsyncIterator[EmberMug]:
+    async def connection(self, **kwargs: str) -> AsyncGenerator[EmberMug]:
         """Establish a connection and close automatically."""
         self.set_client_options(**kwargs)
         # This will happen automatically, but calling it now will give us immediate feedback

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/ember_mug/utils.py

@@ -65,7 +65,7 @@ def get_colour_from_int(colour_id: int) -> DeviceColour | None:  # noqa: PLR0911
     """Extrapolate device colour from integer in advertiser data."""
     if colour_id in (-127, -63, 1, 14, 65):
         return DeviceColour.BLACK
-    if colour_id in (-126, -62, 2):
+    if colour_id in (-126, -62, 2, 130):
         return DeviceColour.WHITE
     if colour_id in (-120, -117, -63, -56, -53, 8, 11):
         return DeviceColour.RED

{python_ember_mug-1.3.2 → python_ember_mug-1.4.0b1}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 ]
 dependencies = [
     "bleak-retry-connector>=4.0.2",
-    "bleak>=1.0.1,<2.2.0",
+    "bleak>=1.0.1",
 ]
 
 [project.optional-dependencies]
@@ -32,7 +32,7 @@ docs = [
     "mkdocs-autorefs",
     "mkdocs-literate-nav",
     "mkdocs-gen-files",
-    "black",
+    "black>=26.3.1",
     "termynal",
 ]
 dev = ["ipython"]
@@ -76,13 +76,14 @@ features = ["test"]
 
 [[tool.hatch.envs.test.matrix]]
 python = ["3.11", "3.12", "3.13", "3.14"]
+bleak = ["1.0.1", "2.0.0", "3.0.2"]
 
 [tool.hatch.envs.test.scripts]
 cov = "pytest -vvv --asyncio-mode=auto --cov=ember_mug --cov-branch --cov-report=xml --cov-report=term-missing tests"
 no-cov = "cov --no-cov"
 
 [tool.hatch.envs.docs]
-python = "3.13"
+python = "3.14"
 features = ["docs"]
 
 [tool.hatch.envs.docs.scripts]