aioccl 2024.12.2__py3-none-any.whl → 2024.12.5__py3-none-any.whl

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,7 +34,7 @@ class CCLSensor:
     @property
     def compartment(self) -> None | str:
         """Decide which compartment it belongs to."""
-        if CCL_SENSORS[self._key].compartment is not None:
+        if CCL_SENSORS[self._key].compartment:
             return CCL_SENSORS[self._key].compartment.value
 
     @property
@@ -49,7 +49,8 @@ class CCLSensor:
             return CCL_SENSOR_VALUES[self.sensor_type.name].get(self._value)
         elif self.sensor_type == CCLSensorTypes.BATTERY_BINARY:
             try:
-                return int(self._value) - 1
+                x = int(self._value) - 1
+                return x
             except ValueError:
                 pass
         else:

aioccl/server.py

@@ -24,15 +24,10 @@ class CCLServer:
     def register(device: CCLDevice) -> None:
         """Register a device with a passkey."""
         CCLServer.devices.setdefault(device.passkey, device)
-        _LOGGER.debug("Device registered: %s", CCLServer.devices)
-
-    @staticmethod
-    def get_handler() -> Callable[[web.BaseRequest], web.Response]:
-        """Get the handler."""
-        return CCLServer._handler
+        _LOGGER.debug("Device registered: %s", device)
     
     @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,11 +38,12 @@ class CCLServer:
         _text: None | str = None
 
         try:
-            for passkey, _device in CCLServer.devices.items():
-                if passkey == request.match_info["passkey"]:
-                    _passkey = passkey
+            _passkey = request.path[-8:]
+            for passkey in CCLServer.devices:
+                if passkey == _passkey:
+                    _device = CCLServer.devices[_passkey]
                     break
-            assert _device, 404
+            assert isinstance(_device, CCLDevice), 404
 
             assert request.content_type == "application/json", 400
             assert 0 < request.content_length <= 5000, 400
@@ -81,7 +77,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.2.dist-info → aioccl-2024.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.12.2
+Version: 2024.12.5
 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.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioccl/__init__.py,sha256=XnegKtbvHvUTwVuuWNLb4LB9ZuGGar0xrZYOqk7scyg,133
+aioccl/device.py,sha256=4TYkr3O4XI2l3XdTlGs62qXxsa0pA0_ig0d87nXwaSY,5278
+aioccl/sensor.py,sha256=6F4iJytKjP6GkOtjxBVb31roIop_C1qnHt_wBP88dHE,16908
+aioccl/server.py,sha256=9-rn-kQKKYguqOALTHE2kLzgZBa43SvrbrPN7O8U9jw,3237
+aioccl-2024.12.5.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
+aioccl-2024.12.5.dist-info/METADATA,sha256=6_9VudA-dBm5hqwYandmLBfQeaqb427m0naX7sTQZtk,768
+aioccl-2024.12.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+aioccl-2024.12.5.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
+aioccl-2024.12.5.dist-info/RECORD,,

aioccl-2024.12.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioccl/__init__.py,sha256=XnegKtbvHvUTwVuuWNLb4LB9ZuGGar0xrZYOqk7scyg,133
-aioccl/device.py,sha256=4TYkr3O4XI2l3XdTlGs62qXxsa0pA0_ig0d87nXwaSY,5278
-aioccl/sensor.py,sha256=tMv_ypqsDIxWdghHQv91PUTOt2kUJGygZmFnJtzOx0k,16905
-aioccl/server.py,sha256=k1YgFeNImxYILxalPIV23UDB3hvjaOH4pVWeB7cJkmM,3343
-aioccl-2024.12.2.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
-aioccl-2024.12.2.dist-info/METADATA,sha256=gYgnLScvW9u0xS60IzPWhLc0OqwKJrUQzMEDufl3w0E,768
-aioccl-2024.12.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-aioccl-2024.12.2.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
-aioccl-2024.12.2.dist-info/RECORD,,