python-ember-mug 1.3.0b4__tar.gz → 1.3.0b6__tar.gz

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.3.0b4
+Version: 1.3.0b6
 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/
@@ -16,9 +16,10 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 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>=1.0.1
+Requires-Dist: bleak<2.2.0,>=1.0.1
 Provides-Extra: dev
 Requires-Dist: ipython; extra == 'dev'
 Provides-Extra: docs
@@ -44,7 +45,7 @@ Description-Content-Type: text/markdown
 [![python](https://img.shields.io/pypi/pyversions/python-ember-mug.svg)](https://pypi.org/project/python-ember-mug/)
 [![Build Status](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml/badge.svg)](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml)
 [![codecov](https://codecov.io/gh/sopelj/python-ember-mug/graph/badge.svg?token=2Lw2iVjKsG)](https://codecov.io/gh/sopelj/python-ember-mug)
-![Project Maintenance](https://img.shields.io/maintenance/yes/2025.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2026.svg)
 [![Maintainer](https://img.shields.io/badge/maintainer-%40sopelj-blue.svg)](https://github.com/sopelj)
 [![License](https://img.shields.io/github/license/sopelj/python-ember-mug.svg)](https://github.com/sopelj/python-ember-mug/blob/main/LICENSE)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen)](https://github.com/pre-commit/pre-commit)
@@ -177,8 +178,6 @@ Device Data
 +--------------+----------------------+
 | Target Temp  | 55.00°C              |
 +--------------+----------------------+
-| Use Metric   | True                 |
-+--------------+----------------------+
 
 Watching for changes
 Current Temp changed from "24.50°C" to "25.50°"

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/README.md

@@ -4,7 +4,7 @@
 [![python](https://img.shields.io/pypi/pyversions/python-ember-mug.svg)](https://pypi.org/project/python-ember-mug/)
 [![Build Status](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml/badge.svg)](https://github.com/sopelj/python-ember-mug/actions/workflows/tests.yml)
 [![codecov](https://codecov.io/gh/sopelj/python-ember-mug/graph/badge.svg?token=2Lw2iVjKsG)](https://codecov.io/gh/sopelj/python-ember-mug)
-![Project Maintenance](https://img.shields.io/maintenance/yes/2025.svg)
+![Project Maintenance](https://img.shields.io/maintenance/yes/2026.svg)
 [![Maintainer](https://img.shields.io/badge/maintainer-%40sopelj-blue.svg)](https://github.com/sopelj)
 [![License](https://img.shields.io/github/license/sopelj/python-ember-mug.svg)](https://github.com/sopelj/python-ember-mug/blob/main/LICENSE)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen)](https://github.com/pre-commit/pre-commit)
@@ -137,8 +137,6 @@ Device Data
 +--------------+----------------------+
 | Target Temp  | 55.00°C              |
 +--------------+----------------------+
-| Use Metric   | True                 |
-+--------------+----------------------+
 
 Watching for changes
 Current Temp changed from "24.50°C" to "25.50°"

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/__init__.py

@@ -6,4 +6,4 @@ __all__ = ("EmberMug",)
 
 __author__ = """Jesse Sopel"""
 __email__ = "jesse.sopel@gmail.com"
-__version__ = "1.3.0b4"
+__version__ = "1.3.0b6"

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/cli/commands.py

@@ -112,9 +112,9 @@ async def poll_device_cmd(args: Namespace) -> None:
         for _ in CommandLoop():
             for _ in range(60):
                 await asyncio.sleep(1)
-                print_changes(await mug.update_queued_attributes(), mug.data.use_metric)
+                print_changes(await mug.update_queued_attributes(), mug.data.user_unit)
             # Every minute do a full update
-            print_changes(await mug.update_all(), mug.data.use_metric)
+            print_changes(await mug.update_all(), mug.data.user_unit)
 
 
 async def get_device_value_cmd(args: Namespace) -> None:

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/cli/helpers.py

@@ -2,13 +2,12 @@
 
 from __future__ import annotations
 
-import re
 from argparse import ArgumentTypeError
 from collections import defaultdict
 from functools import partial
 from typing import TYPE_CHECKING
 
-from ember_mug.consts import MAC_ADDRESS_REGEX
+from ember_mug.consts import IS_MACOS, MAC_ADDRESS_REGEX, MAC_UUID_REGEX, TemperatureUnit
 from ember_mug.data import Change
 from ember_mug.formatting import format_led_colour, format_liquid_level, format_temp
 
@@ -26,7 +25,8 @@ base_formatters: dict[str, Callable] = {
 
 def validate_mac(value: str) -> str:
     """Check if specified MAC Address is valid."""
-    if not isinstance(value, str) or not re.match(MAC_ADDRESS_REGEX, value):
+    mac_reg = MAC_UUID_REGEX if IS_MACOS else MAC_ADDRESS_REGEX
+    if not isinstance(value, str) or not mac_reg.match(value):
         raise ArgumentTypeError("Invalid MAC Address")
     return value.lower()
 
@@ -62,11 +62,11 @@ def print_info(mug: EmberMug) -> None:
     print_table(list(mug.data.formatted.items()))
 
 
-def print_changes(changes: list[Change], metric: bool = True) -> None:
+def print_changes(changes: list[Change], unit: TemperatureUnit | None) -> None:
     """Print changes."""
     formatters: dict[str, Callable] = {
-        "current_temp": partial(format_temp, metric=metric),
-        "target_temp": partial(format_temp, metric=metric),
+        "current_temp": partial(format_temp, unit=unit),
+        "target_temp": partial(format_temp, unit=unit),
         **base_formatters,
     }
     for attr, old_value, new_value in changes:

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/consts.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import platform
 import re
-from enum import Enum, IntEnum
+from enum import IntEnum, StrEnum
 from functools import cached_property
 from typing import NamedTuple
 from uuid import UUID
@@ -17,7 +17,7 @@ EMBER_BLE_SIG = 0x03C1
 DEFAULT_NAME = "Ember Device"
 
 
-class DeviceType(str, Enum):
+class DeviceType(StrEnum):
     """Base device types."""
 
     CUP = "cup"
@@ -26,7 +26,7 @@ class DeviceType(str, Enum):
     TUMBLER = "tumbler"
 
 
-class DeviceModel(str, Enum):
+class DeviceModel(StrEnum):
     """Know device models."""
 
     CUP_6_OZ = "CM21S"
@@ -50,7 +50,7 @@ DEVICE_MODEL_NAMES: dict[DeviceModel, str] = {
 }
 
 
-class DeviceColour(str, Enum):
+class DeviceColour(StrEnum):
     """All colours possible found across models."""
 
     SAGE_GREEN = "Sage Green"
@@ -66,7 +66,7 @@ class DeviceColour(str, Enum):
     ROSE_GOLD = "Rose Gold"
 
 
-class TemperatureUnit(str, Enum):
+class TemperatureUnit(StrEnum):
     """Temperature Units."""
 
     CELSIUS = "°C"
@@ -177,7 +177,7 @@ class LiquidState(IntEnum):
         return self.label
 
 
-class VolumeLevel(str, Enum):
+class VolumeLevel(StrEnum):
     """Class to manage volume levels."""
 
     LOW = "low"
@@ -240,7 +240,6 @@ ATTR_LABELS = {
     "liquid_level": "Liquid Level",
     "current_temp": "Current Temp",
     "target_temp": "Target Temp",
-    "use_metric": "Use Metric",
     "dsk": "DSK",
     "udsk": "UDSK",
     "date_time_zone": "Date Time + Time Zone",
@@ -269,8 +268,11 @@ UPDATE_ATTRS = {
 EXTRA_ATTRS = {"battery_voltage", "date_time_zone", "udsk", "dsk"}
 
 # Validation
-MUG_NAME_REGEX = re.compile(r"^[A-Za-z0-9,.\[\]#()!\"\';:|\-_+<>%= ]{1,16}$")
+# *Note*: Additional characters are escaped because Home Assistant uses LitElement with "v" mode which is stricter.
+MUG_NAME_REGEX = re.compile(r"^[A-Za-z0-9,.\[\]#\(\)!\"\';:\|\-_+<>%= ]{1,16}$")
 MUG_NAME_PATTERN = MUG_NAME_REGEX.pattern
-MAC_ADDRESS_REGEX = re.compile(r"^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$")
+MAC_ADDRESS_REGEX = re.compile(r"^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$", re.IGNORECASE)
+MAC_UUID_REGEX = re.compile(r"^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", re.IGNORECASE)
 
 IS_LINUX = platform.system() == "Linux"
+IS_MACOS = platform.system() == "Darwin"

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/data.py

@@ -211,7 +211,7 @@ class MugData(AsDict):
 
     # Options
     model_info: ModelInfo
-    use_metric: bool = True
+    use_metric: bool | None = None
     debug: bool = False
 
     # Attributes
@@ -231,6 +231,15 @@ class MugData(AsDict):
     date_time_zone: datetime | None = None
     battery_voltage: int | None = None
 
+    @property
+    def user_unit(self) -> TemperatureUnit | None:
+        """Get the correct unit for the user."""
+        if self.use_metric is False:
+            return TemperatureUnit.FAHRENHEIT
+        if self.use_metric is True:
+            return TemperatureUnit.CELSIUS
+        return None
+
     @property
     def meta_display(self) -> str:
         """Return Meta infor based on preference."""
@@ -263,12 +272,12 @@ class MugData(AsDict):
     @property
     def current_temp_display(self) -> str:
         """Human-readable current temp with unit."""
-        return format_temp(self.current_temp, self.use_metric)
+        return format_temp(self.current_temp, self.user_unit)
 
     @property
     def target_temp_display(self) -> str:
         """Human-readable target temp with unit."""
-        return format_temp(self.target_temp, self.use_metric)
+        return format_temp(self.target_temp, self.user_unit)
 
     def update_info(self, **kwargs: Any) -> list[Change]:
         """Update attributes of the mug if they haven't changed."""
@@ -288,7 +297,7 @@ class MugData(AsDict):
     @property
     def formatted(self) -> dict[str, Any]:
         """Return human-readable names and values for all attributes for display."""
-        all_attrs = self.model_info.device_attributes | {"use_metric"}
+        all_attrs = set(self.model_info.device_attributes)
         if not self.debug:
             all_attrs -= EXTRA_ATTRS
         return {label: self.get_formatted_attr(attr) for attr, label in ATTR_LABELS.items() if attr in all_attrs}
@@ -296,6 +305,7 @@ class MugData(AsDict):
     def as_dict(self) -> dict[str, Any]:
         """Dump all attributes as dict for info/debugging."""
         data = asdict(self)
+        del data["use_metric"]
         all_attrs = self.model_info.device_attributes
         if not self.debug:
             all_attrs -= EXTRA_ATTRS

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/formatting.py

@@ -5,16 +5,17 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from .consts import TemperatureUnit
     from .data import Colour
 
 
-def format_temp(temp: float, metric: bool = True) -> str:
+def format_temp(temp: float, unit: TemperatureUnit | None = None) -> str:
     """Format temperature with the correct unit."""
-    unit = "C" if metric else "F"
-    return f"{temp:.2f}°{unit}"
+    value = f"{temp:.2f}"
+    return f"{value}{unit.value}" if unit else value
 
 
-def format_capacity(capacity: int | None, metric: bool = True) -> str:
+def format_capacity(capacity: int | None, metric: bool | None = None) -> str:
     """Format capacity for display."""
     if capacity is None:
         return "Unknown"

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/ember_mug/mug.py

@@ -7,7 +7,7 @@ import contextlib
 import logging
 import os
 from datetime import UTC, datetime
-from enum import Enum
+from enum import StrEnum
 from functools import cached_property
 from time import time
 from typing import TYPE_CHECKING, Any, Concatenate, Literal, ParamSpec, TypeVar
@@ -46,7 +46,7 @@ if TYPE_CHECKING:
     from bleak.backends.characteristic import BleakGATTCharacteristic
     from bleak.backends.device import BLEDevice
 
-    TempUnitType = Literal["°C", "°F"] | TemperatureUnit | Enum
+    TempUnitType = Literal["°C", "°F"] | TemperatureUnit | StrEnum
 
 
 logger = logging.getLogger(__name__)
@@ -68,7 +68,7 @@ def require_attribute(
         """Inner decorator."""
 
         async def wrapper(self: EmberMug, *args: P.args, **kwargs: P.kwargs) -> T:
-            if self.has_attribute(attr_name) is False:
+            if not self.has_attribute(attr_name):
                 device_type = self.data.model_info.device_type.value
                 raise NotImplementedError(
                     f"The {device_type} does not have the {attr_name} attribute",
@@ -87,7 +87,7 @@ class EmberMug:
         self,
         ble_device: BLEDevice,
         model_info: ModelInfo,
-        use_metric: bool = True,
+        use_metric: bool | None = None,
         debug: bool = False,
         **kwargs: Any,
     ) -> None:
@@ -136,17 +136,13 @@ class EmberMug:
 
     def _convert_to_device_unit(self, value: float) -> float:
         """Convert user value to the unit the device expects."""
-        if self.data.use_metric and self.data.temperature_unit != TemperatureUnit.CELSIUS:
-            return convert_temp_to_fahrenheit(value)
-        if not self.data.use_metric and self.data.temperature_unit != TemperatureUnit.FAHRENHEIT:
+        if self.data.user_unit == TemperatureUnit.FAHRENHEIT:
             return convert_temp_to_celsius(value)
         return value
 
     def _convert_to_user_unit(self, value: float) -> float:
         """Convert device value to the unit the user expects."""
-        if self.data.use_metric and self.data.temperature_unit != TemperatureUnit.CELSIUS:
-            return convert_temp_to_celsius(value)
-        if not self.data.use_metric and self.data.temperature_unit != TemperatureUnit.FAHRENHEIT:
+        if self.data.user_unit == TemperatureUnit.FAHRENHEIT:
             return convert_temp_to_fahrenheit(value)
         return value
 
@@ -291,7 +287,7 @@ class EmberMug:
 
     async def pair(self) -> None:
         """Attempt to pair."""
-        with contextlib.suppress(BleakError, EOFError):
+        with contextlib.suppress(BleakError, EOFError, NotImplementedError):
             await self._ensure_connection()
             await self._client.pair()
 
@@ -314,7 +310,7 @@ class EmberMug:
 
     async def set_target_temp(self, target_temp: float) -> None:
         """Set new target temp for mug."""
-        unit = TemperatureUnit.CELSIUS if self.data.use_metric else TemperatureUnit.FAHRENHEIT
+        unit = TemperatureUnit.FAHRENHEIT if self.data.use_metric is False else TemperatureUnit.CELSIUS
         min_temp, max_temp = MIN_MAX_TEMPS[unit]
         if target_temp != 0 and not (min_temp <= target_temp <= max_temp):
             raise ValueError(f"Temperature should be between {min_temp} and {max_temp} or 0.")
@@ -405,17 +401,11 @@ class EmberMug:
 
     async def set_temperature_unit(self, unit: TempUnitType) -> None:
         """Set mug unit."""
-        text_unit = unit.value if isinstance(unit, Enum) else unit
+        text_unit = unit.value if isinstance(unit, StrEnum) else unit
         unit_bytes = bytearray([1 if text_unit == TemperatureUnit.FAHRENHEIT else 0])
         await self._write(MugCharacteristic.TEMPERATURE_UNIT, unit_bytes)
         self.data.temperature_unit = TemperatureUnit(unit)
 
-    async def ensure_correct_unit(self) -> None:
-        """Set mug unit if it's not what we want."""
-        desired = TemperatureUnit.CELSIUS if self.data.use_metric else TemperatureUnit.FAHRENHEIT
-        if self.data.temperature_unit != desired:
-            await self.set_temperature_unit(desired)
-
     async def get_battery_voltage(self) -> int:
         """Get voltage and charge time."""
         battery_voltage_bytes = await self._read(MugCharacteristic.CONTROL_REGISTER_DATA)

{python_ember_mug-1.3.0b4 → python_ember_mug-1.3.0b6}/pyproject.toml

@@ -14,10 +14,11 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
 ]
 dependencies = [
     "bleak-retry-connector>=4.0.2",
-    "bleak>=1.0.1",
+    "bleak>=1.0.1,<2.2.0",
 ]
 
 [project.optional-dependencies]
@@ -72,7 +73,7 @@ python = "3.13"
 features = ["test"]
 
 [[tool.hatch.envs.test.matrix]]
-python = ["3.11", "3.12", "3.13"]
+python = ["3.11", "3.12", "3.13", "3.14"]
 
 [tool.hatch.envs.test.scripts]
 cov = "pytest -vvv --asyncio-mode=auto --cov=ember_mug --cov-branch --cov-report=xml --cov-report=term-missing tests"
@@ -89,7 +90,7 @@ serve = "mkdocs serve --dev-addr localhost:8000"
 [tool.black]
 line-length = 120
 skip-string-normalization = true
-target-version = ["py311", "py312", "py313"]
+target-version = ["py311", "py312", "py313", "py314"]
 include = '\.pyi?$'
 exclude = '''
 /(