python-ember-mug 1.3.3__tar.gz → 1.4.0b2__tar.gz

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.3.3
+Version: 1.4.0b2
 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/
@@ -18,8 +18,8 @@ Classifier: Programming Language :: Python :: 3.12
 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-retry-connector>=4.6.0
+Requires-Dist: bleak>=3.0.2
 Provides-Extra: dev
 Requires-Dist: ipython; extra == 'dev'
 Provides-Extra: docs

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/ember_mug/__init__.py

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

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/ember_mug/cli/commands.py

@@ -7,10 +7,11 @@ import contextlib
 import logging
 import re
 import sys
-from argparse import ArgumentParser, ArgumentTypeError, FileType, Namespace
-from typing import TYPE_CHECKING, ClassVar
+from argparse import ArgumentParser, ArgumentTypeError, Namespace
+from pathlib import Path
+from typing import IO, 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
@@ -25,6 +26,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)
@@ -215,9 +217,8 @@ class EmberMugCli:
         )
         self.parser.add_argument(
             "--log-file",
-            type=FileType("w", encoding="utf-8"),
+            type=Path,
             nargs="?",
-            default=sys.stdout,
             help="File to write logs too (Will be overwritten)",
         )
         self.parser.add_argument("--version", action="version", version=__version__)
@@ -255,12 +256,23 @@ class EmberMugCli:
     async def run(self) -> None:
         """Run the specified command based on subparser."""
         args = self.parser.parse_args()
+        out_file: IO[str] | None = None
         if IS_LINUX is False:
             args.adapter = None  # Set for other platforms
         if args.debug:
+            if args.log_file:
+                try:
+                    out_file = args.log_file.open("w")
+                except OSError as e:
+                    self.parser.error(f"Failed to open '{args.log_file}': {e}")
+
             logging.basicConfig(
-                stream=args.log_file,
+                stream=out_file or sys.stdout,
                 level=logging.DEBUG,
                 format="[%(asctime)s] %(levelname)s [%(filename)s.%(funcName)s:%(lineno)d] %(message)s",
             )
-        await self._commands[args.command](args)
+        try:
+            await self._commands[args.command](args)
+        finally:
+            if out_file is not None:
+                out_file.close()

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/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.3 → python_ember_mug-1.4.0b2}/ember_mug/mug.py

@@ -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."""

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/ember_mug/scanner.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import logging
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from bleak import BleakScanner
 
@@ -14,13 +14,14 @@ from .consts import DEVICE_SERVICE_UUIDS, IS_LINUX
 if TYPE_CHECKING:
     from typing import NotRequired, TypedDict
 
+    from bleak import BlueZScannerArgs
     from bleak.backends.device import BLEDevice
     from bleak.backends.scanner import AdvertisementData
 
-    class ScannerKwargs(TypedDict):
+    class BleakScannerKwargs(TypedDict):
         """Optional kwargs for scanner."""
 
-        adapter: NotRequired[str]
+        bluez: NotRequired[BlueZScannerArgs]
         service_uuids: NotRequired[list[str]]
 
 
@@ -29,13 +30,17 @@ DEFAULT_TIMEOUT = 30
 logger = logging.getLogger(__name__)
 
 
-def build_scanner_kwargs(adapter: str | None = None, *, service_uuids: list[str] | None = None) -> ScannerKwargs:
+def build_scanner_kwargs(adapter: str | None = None, *, service_uuids: list[str] | None = None) -> BleakScannerKwargs:
     """Add Adapter to kwargs for scanner if specified and using BlueZ."""
     if adapter and IS_LINUX is not True:
         msg = "The adapter option is only valid for the Linux BlueZ Backend."
         raise ValueError(msg)
-    kwargs = {"service_uuids": service_uuids} if service_uuids else {}
-    return cast("ScannerKwargs", kwargs | {"adapter": adapter} if adapter else kwargs)
+    kwargs: BleakScannerKwargs = {}
+    if service_uuids:
+        kwargs |= {"service_uuids": service_uuids}
+    if adapter:
+        kwargs |= {"bluez": {"adapter": adapter}}
+    return kwargs
 
 
 async def discover_devices(

{python_ember_mug-1.3.3 → python_ember_mug-1.4.0b2}/pyproject.toml

@@ -17,8 +17,8 @@ classifiers = [
     'Programming Language :: Python :: 3.14',
 ]
 dependencies = [
-    "bleak-retry-connector>=4.0.2",
-    "bleak>=1.0.1,<2.2.0",
+    "bleak-retry-connector>=4.6.0",
+    "bleak>=3.0.2",
 ]
 
 [project.optional-dependencies]
@@ -76,13 +76,14 @@ features = ["test"]
 
 [[tool.hatch.envs.test.matrix]]
 python = ["3.11", "3.12", "3.13", "3.14"]
+bleak = ["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]