aioccl 2025.4__py3-none-any.whl → 2025.6__py3-none-any.whl

aioccl/device.py

@@ -27,11 +27,7 @@ class CCLDevice:
             model: str | None
             passkey: str
             serial_no: str | None
-            
-        class Data(TypedDict):
-            """Store sensor data."""
-            binary_sensors: dict[str, CCLSensor]
-            sensors: dict[str, CCLSensor]
+
 
         self._info: Info = {
             "fw_ver": None,
@@ -41,15 +37,11 @@ class CCLDevice:
             "passkey": passkey,
             "serial_no": None,
         }
-        
-        self._data: Data = {
-            "binary_sensors": {},
-            "sensors": {}
-        }
-        
+
+        self._sensors: dict[str, CCLSensor] = {}
+
         self._update_callback = {}
 
-        self._new_binary_sensor_callbacks = set()
         self._new_sensors: list[CCLSensor] | None = []
         self._new_sensor_callbacks = set()
 
@@ -93,9 +85,9 @@ class CCLDevice:
         return self._info["fw_ver"]
 
     @property
-    def get_data(self) -> dict[str, dict[str, CCLSensor]]:
+    def get_sensors(self) -> dict[str, CCLSensor]:
         """Get all types of sensor data under this device."""
-        return self._data
+        return self._sensors
 
     def update_info(self, new_info: dict[str, None | str]) -> None:
         """Add or update device info."""
@@ -107,16 +99,10 @@ class CCLDevice:
     def process_data(self, data: dict[str, None | str | int | float]) -> None:
         """Add or update all sensor values."""
         for key, value in data.items():
-            if CCL_SENSORS.get(key).binary:
-                if key not in self._data["binary_sensors"]:
-                    self._data["binary_sensors"][key] = CCLSensor(key)
-                    self._new_sensors.append(self._data["binary_sensors"][key])
-                self._data["binary_sensors"][key].value = value
-            else:
-                if key not in self._data["sensors"]:
-                    self._data["sensors"][key] = CCLSensor(key)
-                    self._new_sensors.append(self._data["sensors"][key])
-                self._data["sensors"][key].value = value
+            if key not in self._sensors:
+                self._sensors[key] = CCLSensor(key)
+                self._new_sensors.append(self._sensors[key])
+            self._sensors[key].value = value
 
         add_count = self._publish_new_sensors()
         _LOGGER.debug(
@@ -140,7 +126,7 @@ class CCLDevice:
     def _publish_updates(self) -> None:
         """Call the function to update sensor data."""
         try:
-            self._update_callback(self._data)
+            self._update_callback(self._sensors)
         except Exception as err:  # pylint: disable=broad-exception-caught
             _LOGGER.warning(
                 "Error while updating sensors for device %s: %s",

aioccl/sensor.py

@@ -38,11 +38,6 @@ class CCLSensor:
             return CCL_SENSORS[self._key].compartment.value
         return None
 
-    @property
-    def binary(self) -> bool:
-        """Decide if the sensor is binary."""
-        return CCL_SENSORS[self._key].binary
-
     @property
     def value(self) -> None | str | int | float:
         """Return the intrinsic sensor value."""
@@ -62,7 +57,6 @@ class CCLSensorPreset:
     name: str
     sensor_type: str
     compartment: CCLDeviceCompartment | None = None
-    binary: bool = False
 
 
 class CCLSensorTypes(enum.Enum):
@@ -335,25 +329,25 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
     ),
     # Status 78-119
     "t234c1bat": CCLSensorPreset(
-        "Battery: CH1", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH1", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c2bat": CCLSensorPreset(
-        "Battery: CH2", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH2", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c3bat": CCLSensorPreset(
-        "Battery: CH3", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH3", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c4bat": CCLSensorPreset(
-        "Battery: CH4", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH4", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c5bat": CCLSensorPreset(
-        "Battery: CH5", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH5", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c6bat": CCLSensorPreset(
-        "Battery: CH6", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH6", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t234c7bat": CCLSensorPreset(
-        "Battery: CH7", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS, True
+        "Battery: CH7", CCLSensorTypes.BATTERY_BINARY, CCLDeviceCompartment.STATUS
     ),
     "t11bat": CCLSensorPreset(
         "Battery Level: CO", CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS
@@ -365,7 +359,6 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
         "Battery: Console",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t9bat": CCLSensorPreset(
         "Battery Level: HCHO/VOC", CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS
@@ -374,55 +367,46 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
         "Battery: Leakage CH1",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c2bat": CCLSensorPreset(
         "Battery: Leakage CH2",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c3bat": CCLSensorPreset(
         "Battery: Leakage CH3",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c4bat": CCLSensorPreset(
         "Battery: Leakage CH4",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c5bat": CCLSensorPreset(
         "Battery: Leakage CH5",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c6bat": CCLSensorPreset(
         "Battery: Leakage CH6",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c7bat": CCLSensorPreset(
         "Battery: Leakage CH7",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t5lsbat": CCLSensorPreset(
         "Battery: Lightning Sensor",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t1bat": CCLSensorPreset(
         "Battery: Sensor Array",
         CCLSensorTypes.BATTERY_BINARY,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t1batvt": CCLSensorPreset(
         "Battery Voltage: Sensor Array",
@@ -433,99 +417,87 @@ CCL_SENSORS: dict[str, CCLSensorPreset] = {
         "Battery Level: PM2.5/10", CCLSensorTypes.BATTERY, CCLDeviceCompartment.STATUS
     ),
     "t234c1cn": CCLSensorPreset(
-        "Connection: CH1", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH1", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c2cn": CCLSensorPreset(
-        "Connection: CH2", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH2", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c3cn": CCLSensorPreset(
-        "Connection: CH3", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH3", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c4cn": CCLSensorPreset(
-        "Connection: CH4", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH4", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c5cn": CCLSensorPreset(
-        "Connection: CH5", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH5", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c6cn": CCLSensorPreset(
-        "Connection: CH6", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH6", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t234c7cn": CCLSensorPreset(
-        "Connection: CH7", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CH7", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t6c1cn": CCLSensorPreset(
         "Connection: Leakage CH1",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c2cn": CCLSensorPreset(
         "Connection: Leakage CH2",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c3cn": CCLSensorPreset(
         "Connection: Leakage CH3",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c4cn": CCLSensorPreset(
         "Connection: Leakage CH4",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c5cn": CCLSensorPreset(
         "Connection: Leakage CH5",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c6cn": CCLSensorPreset(
         "Connection: Leakage CH6",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t6c7cn": CCLSensorPreset(
         "Connection: Leakage CH7",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t5lscn": CCLSensorPreset(
         "Connection: Lightning Sensor",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t11cn": CCLSensorPreset(
-        "Connection: CO", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS, True
+        "Connection: CO", CCLSensorTypes.CONNECTION, CCLDeviceCompartment.STATUS
     ),
     "t10cn": CCLSensorPreset(
         "Connection: CO\u2082",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t9cn": CCLSensorPreset(
         "Connection: HCHO/VOC",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t1cn": CCLSensorPreset(
         "Connection: Sensor Array",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
     "t8cn": CCLSensorPreset(
         "Connection: PM2.5/10",
         CCLSensorTypes.CONNECTION,
         CCLDeviceCompartment.STATUS,
-        True,
     ),
 }

aioccl/server.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from http import HTTPStatus
 import logging
 
 from aiohttp import web
@@ -43,22 +44,22 @@ class CCLServer:
                 if passkey == ref_passkey:
                     device = ref_device
                     break
-            assert isinstance(device, CCLDevice), 404
+            assert isinstance(device, CCLDevice), HTTPStatus.NOT_FOUND
 
-            assert request.content_type == "application/json", 400
-            assert 0 < request.content_length <= 5000, 400
+            assert request.content_type == "application/json", HTTPStatus.BAD_REQUEST
+            assert 0 < request.content_length <= 5000, HTTPStatus.BAD_REQUEST
 
             body = await request.json()
 
         except Exception as err:  # pylint: disable=broad-exception-caught
             status = err.args[0]
-            if status == 400:
-                text = "400 Bad Request"
-            elif status == 404:
-                text = "404 Not Found"
+            if status == HTTPStatus.BAD_REQUEST:
+                text = "400 Bad Request."
+            elif status == HTTPStatus.NOT_FOUND:
+                text = "404 Not Found."
             else:
-                status = 500
-                text = "500 Internal Server Error"
+                status = HTTPStatus.INTERNAL_SERVER_ERROR
+                text = "500 Internal Server Error."
             _LOGGER.debug("Request exception occured: %s", err)
             return web.Response(status=status, text=text)
 
@@ -70,7 +71,7 @@ class CCLServer:
 
         device.update_info(info)
         device.process_data(data)
-        status = 200
+        status = HTTPStatus.OK
         text = "200 OK"
         _LOGGER.debug("Request processed: %s", passkey)
         return web.Response(status=status, text=text)

{aioccl-2025.4.dist-info → aioccl-2025.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioccl
-Version: 2025.4
+Version: 2025.6
 Summary: A Python library for CCL API server
 Home-page: https://github.com/CCL-Electronics-Ltd/aioccl
 Download-URL: https://github.com/CCL-Electronics-Ltd/aioccl

aioccl-2025.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioccl/__init__.py,sha256=XnegKtbvHvUTwVuuWNLb4LB9ZuGGar0xrZYOqk7scyg,133
+aioccl/device.py,sha256=t3-3MP-RjaX7FM14A0axh9YDg-Xh2ICkgAMR-OHKYKg,5017
+aioccl/sensor.py,sha256=dtBC4hXH6ac3Tw4iUEtDfCB4qGepJBpPgobIVjx8QEc,16346
+aioccl/server.py,sha256=niD0h2i6rS1qr4vCmepwEBhVIylvVGt7_WbBO0-Z1Rs,3377
+aioccl-2025.6.dist-info/licenses/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
+aioccl-2025.6.dist-info/METADATA,sha256=8MrzFaaelX_71yiD2ZieCpEvZ9Wmvq3KNNKRNhRuL-g,989
+aioccl-2025.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aioccl-2025.6.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
+aioccl-2025.6.dist-info/RECORD,,

{aioccl-2025.4.dist-info → aioccl-2025.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

aioccl-2025.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioccl/__init__.py,sha256=XnegKtbvHvUTwVuuWNLb4LB9ZuGGar0xrZYOqk7scyg,133
-aioccl/device.py,sha256=7UUEcg__1Q-gug8E5nuTAP_TWVeyoeuZSvNNUjIwJ1g,5691
-aioccl/sensor.py,sha256=-yWdgBzOzLPHP2GBqvhVVGbIlt17y_3OSHibhB_DsQ8,16905
-aioccl/server.py,sha256=RvWH6hqlQDq82u_8oO69SA0qeCDWGdVoi0wb5uYKQrs,3216
-aioccl-2025.4.dist-info/licenses/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
-aioccl-2025.4.dist-info/METADATA,sha256=e5mkGmPL4RnVj1XCNqXRW8NOybwroWVyhlezyIe6yCY,989
-aioccl-2025.4.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-aioccl-2025.4.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
-aioccl-2025.4.dist-info/RECORD,,