aioccl 2024.12.3__tar.gz → 2024.12.6__tar.gz

{aioccl-2024.12.3 → aioccl-2024.12.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.12.3
+Version: 2024.12.6
 Summary: A Python library for CCL API server
 Home-page: https://github.com/fkiscd/aioccl
 Download-URL: https://github.com/fkiscd/aioccl

{aioccl-2024.12.3 → aioccl-2024.12.6}/aioccl/device.py

@@ -16,21 +16,22 @@ CCL_DEVICE_INFO_TYPES = ("serial_no", "mac_address", "model", "fw_ver")
 class CCLDevice:
     """Mapping for a CCL device."""
     _binary_sensors: dict[str, CCLSensor] | None = {}
-    _fw_ver: str | None
-    _last_updated_time: float | None
-    _mac_address: str | None
-    _model: str | None
+    _device_id: str | None = None
+    _fw_ver: str | None = None
+    _last_updated_time: float | None = None
+    _mac_address: str | None = None
+    _model: str | None = None
     _new_binary_sensor_callbacks = set()
     _new_sensors: list[CCLSensor] | None = []
     _new_sensor_callbacks = set()
+    _passkey = ''
     _sensors: dict[str, CCLSensor] | None = {}
-    _serial_no: str | None
+    _serial_no: str | None = None
     _update_callbacks = set()
     
 
     def __init__(self, passkey: str):
         """Initialize a CCL device."""
-        _LOGGER.debug("Initializing CCL Device: %s", self)
         self._passkey = passkey
 
     @property
@@ -41,12 +42,18 @@ class CCLDevice:
     @property
     def device_id(self) -> str | None:
         """Return the device ID."""
-        return self._mac_address.replace(":", "").lower()[-6:]
+        try:
+            self._device_id = self._mac_address.replace(":", "").lower()[-6:]
+        except Exception:  # pylint: disable=broad-exception-caught
+            return None
+        return self._device_id
 
     @property
     def name(self) -> str | None:
         """Return the display name."""
-        return self._model + " - " + self.device_id
+        if self._device_id is not None:
+            return self._model + " - " + self._device_id
+        return self._model
 
     @property
     def mac_address(self) -> str | None:
@@ -133,7 +140,6 @@ class CCLDevice:
         """Schedule call all registered callbacks."""
         for sensor in self._new_sensors[:]:
             try:
-                _LOGGER.debug("Publishing new sensor: %s", sensor)
                 if sensor.binary:
                     for callback in self._new_binary_sensor_callbacks:
                         callback(sensor)

{aioccl-2024.12.3 → aioccl-2024.12.6}/aioccl/sensor.py

@@ -13,7 +13,7 @@ class CCLSensor:
         """Initialize a CCL sensor."""
         self._value: None | str | int | float = None
 
-        if key in CCL_SENSORS.keys():
+        if key in CCL_SENSORS:
             self._key = key
 
     @property
@@ -34,8 +34,9 @@ class CCLSensor:
     @property
     def compartment(self) -> None | str:
         """Decide which compartment it belongs to."""
-        if CCL_SENSORS[self._key].compartment is not None:
+        if isinstance(CCL_SENSORS[self._key].compartment, CCLDeviceCompartment):
             return CCL_SENSORS[self._key].compartment.value
+        return None
 
     @property
     def binary(self) -> bool:
@@ -47,13 +48,12 @@ class CCLSensor:
         """Return the intrinsic sensor value."""
         if self.sensor_type.name in CCL_SENSOR_VALUES:
             return CCL_SENSOR_VALUES[self.sensor_type.name].get(self._value)
-        elif self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
+        if self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
             try:
                 return int(self._value) - 1
             except ValueError:
                 pass
-        else:
-            return self._value
+        return self._value
 
     @value.setter
     def value(self, new_value):
@@ -66,7 +66,7 @@ class CCLSensorPreset:
 
     name: str
     sensor_type: str
-    compartment: None | CCLDeviceCompartment = None
+    compartment: CCLDeviceCompartment | None = None
     binary: bool = False
 
 

{aioccl-2024.12.3 → aioccl-2024.12.6}/aioccl/server.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-from typing import Callable
 
 from aiohttp import web
 
@@ -25,14 +24,9 @@ class CCLServer:
         """Register a device with a passkey."""
         CCLServer.devices.setdefault(device.passkey, device)
         _LOGGER.debug("Device registered: %s", device)
-
-    @staticmethod
-    def get_handler() -> Callable[[web.BaseRequest], web.Response]:
-        """Get the handler."""
-        return CCLServer._handler
     
     @staticmethod
-    async def _handler(request: web.BaseRequest) -> web.Response:
+    async def handler(request: web.BaseRequest | web.Request) -> web.Response:
         """Handle POST requests for data updating."""
         _body: dict[str, None | str | int | float] = {}
         _device: CCLDevice = None
@@ -43,12 +37,12 @@ class CCLServer:
         _text: None | str = None
 
         try:
+            _passkey = request.path[-8:]
             for passkey in CCLServer.devices:
-                if passkey == request.match_info["passkey"]:
-                    _passkey = passkey
+                if passkey == _passkey:
+                    _device = CCLServer.devices[_passkey]
                     break
-            _device = CCLServer.devices[_passkey]
-            assert _device, 404
+            assert isinstance(_device, CCLDevice), 404
 
             assert request.content_type == "application/json", 400
             assert 0 < request.content_length <= 5000, 400
@@ -82,7 +76,7 @@ class CCLServer:
         return web.Response(status=_status, text=_text)
 
     app = web.Application()
-    app.add_routes([web.get('/{passkey}', _handler)])
+    app.add_routes([web.get('/{passkey}', handler)])
     runner = web.AppRunner(app)
 
     @staticmethod

{aioccl-2024.12.3 → aioccl-2024.12.6}/aioccl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.12.3
+Version: 2024.12.6
 Summary: A Python library for CCL API server
 Home-page: https://github.com/fkiscd/aioccl
 Download-URL: https://github.com/fkiscd/aioccl

{aioccl-2024.12.3 → aioccl-2024.12.6}/setup.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from setuptools import find_packages, setup
 
-VERSION = "2024.12.3"
+VERSION = "2024.12.6"
 
 ROOT_DIR = Path(__file__).parent.resolve()