python-ember-mug 1.3.0b5__tar.gz → 1.3.0b7__tar.gz

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ember-mug
-Version: 1.3.0b5
+Version: 1.3.0b7
 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/

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/ember_mug/__init__.py

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

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/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, TemperatureUnit
+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()
 

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/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"
@@ -268,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.0b5 → python_ember_mug-1.3.0b7}/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__)
@@ -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.user_unit == TemperatureUnit.CELSIUS and self.data.temperature_unit == TemperatureUnit.FAHRENHEIT:
-            return convert_temp_to_fahrenheit(value)
-        if self.data.user_unit == TemperatureUnit.FAHRENHEIT and self.data.temperature_unit == TemperatureUnit.CELSIUS:
+        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.user_unit == TemperatureUnit.CELSIUS and self.data.temperature_unit == TemperatureUnit.FAHRENHEIT:
-            return convert_temp_to_celsius(value)
-        if self.data.user_unit == TemperatureUnit.FAHRENHEIT and self.data.temperature_unit == TemperatureUnit.CELSIUS:
+        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,11 +310,11 @@ class EmberMug:
 
     async def set_target_temp(self, target_temp: float) -> None:
         """Set new target temp for mug."""
-        if self.data.use_metric is not None:
-            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.")
+        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 '{target_temp}' is not between {min_temp} and {max_temp} or 0.")
+
         target_temp = self._convert_to_device_unit(target_temp)
         target = bytearray(round(target_temp / 0.01).to_bytes(2, "little"))
         await self._write(MugCharacteristic.TARGET_TEMPERATURE, target)
@@ -405,7 +401,7 @@ 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)

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/ember_mug/utils.py

@@ -67,13 +67,13 @@ def get_colour_from_int(colour_id: int) -> DeviceColour | None:  # noqa: PLR0911
         return DeviceColour.BLACK
     if colour_id in (-126, -62, 2):
         return DeviceColour.WHITE
-    if colour_id in (8, 11, -56, -63, -120, -117, -53):
+    if colour_id in (-120, -117, -63, -56, -53, 8, 11):
         return DeviceColour.RED
-    if colour_id in (-131, -125, -61, 3, 83):
+    if colour_id in (-131, -125, -61, 3, 51, 83):
         return DeviceColour.COPPER
     if colour_id in (-124, -60):
         return DeviceColour.ROSE_GOLD
-    if colour_id in (-59, -123):
+    if colour_id in (-123, -59):
         return DeviceColour.STAINLESS_STEEL
     return {
         -51: DeviceColour.SANDSTONE,
@@ -95,7 +95,7 @@ def get_model_from_single_int_and_services(  # noqa PLR0911
         return DeviceModel.MUG_1_10_OZ
     if model_id == 65:
         return DeviceModel.MUG_1_14_OZ
-    if model_id in (-51, -59, -63, -61, -62):
+    if model_id in (-51, -59, -63, -61, -62, 120):
         return DeviceModel.MUG_2_14_OZ
     if model_id == -60:
         return DeviceModel.CUP_6_OZ
@@ -108,7 +108,7 @@ def get_model_from_id_and_gen(model_id: int, generation: int) -> DeviceModel | N
     """Extract model from identifier in advertiser data."""
     if model_id == 1:
         return DeviceModel.MUG_1_10_OZ if generation < 2 else DeviceModel.MUG_2_10_OZ
-    if model_id == 2:
+    if model_id in (2, 120):
         return DeviceModel.MUG_1_14_OZ if generation < 2 else DeviceModel.MUG_2_14_OZ
     if model_id == 3:
         return DeviceModel.TRAVEL_MUG_12_OZ

{python_ember_mug-1.3.0b5 → python_ember_mug-1.3.0b7}/pyproject.toml

@@ -74,7 +74,6 @@ features = ["test"]
 
 [[tool.hatch.envs.test.matrix]]
 python = ["3.11", "3.12", "3.13", "3.14"]
-bleak = ["1.0.1", "2.0.0"]
 
 [tool.hatch.envs.test.scripts]
 cov = "pytest -vvv --asyncio-mode=auto --cov=ember_mug --cov-branch --cov-report=xml --cov-report=term-missing tests"