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

aioccl/device.py

@@ -1,4 +1,5 @@
 """CCL device mapping."""
+
 from __future__ import annotations
 
 import logging
@@ -11,72 +12,73 @@ _LOGGER = logging.getLogger(__name__)
 
 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
+    _new_binary_sensor_callbacks = set()
+    _new_sensors: list[CCLSensor] | None = []
+    _new_sensor_callbacks = set()
+    _sensors: dict[str, CCLSensor] | None = {}
+    _serial_no: str | None
+    _update_callbacks = set()
+    
+
     def __init__(self, passkey: str):
         """Initialize a CCL device."""
-        _LOGGER.debug('Initializing CCL Device: %s', self)
+        _LOGGER.debug("Initializing CCL Device: %s", self)
         self._passkey = passkey
-        
-        self._serial_no: str | None
-        self._mac_address: str | None
-        self._model: str | None
-        self._fw_ver: str | None
-        self._binary_sensors: dict[str, CCLSensor] | None = {}
-        self._sensors: dict[str, CCLSensor] | None = {}
-        self._last_updated_time: float | None
-
-        self._new_sensors: list[CCLSensor] | None = []
-        
-        self._update_callbacks = set() 
-        self._new_binary_sensor_callbacks = set()
-        self._new_sensor_callbacks = set()
-    
+
     @property
     def passkey(self) -> str:
         """Return the passkey."""
         return self._passkey
-    
+
     @property
     def device_id(self) -> str | None:
         """Return the device ID."""
         return self._mac_address.replace(":", "").lower()[-6:]
-    
+
     @property
     def name(self) -> str | None:
         """Return the display name."""
         return self._model + " - " + self.device_id
-    
+
     @property
     def mac_address(self) -> str | None:
         """Return the MAC address."""
         return self._mac_address
-    
+
     @property
     def model(self) -> str | None:
         """Return the model."""
         return self._model
-    
+
     @property
     def fw_ver(self) -> str | None:
         """Return the firmware version."""
         return self._fw_ver
-    
+
     @property
     def binary_sensors(self) -> dict[str, CCLSensor] | None:
         """Store binary sensor data under this device."""
         return self._binary_sensors
-    
+
     @property
     def sensors(self) -> dict[str, CCLSensor] | None:
         """Store sensor data under this device."""
         return self._sensors
-    
+
     def update_info(self, info: dict[str, None | str]) -> None:
         """Add or update device info."""
-        self._mac_address = info.get('mac_address')
-        self._model = info.get('model')
-        self._fw_ver = info.get('fw_ver')
-    
+        self._mac_address = info.get("mac_address")
+        self._model = info.get("model")
+        self._fw_ver = info.get("fw_ver")
+
     def update_sensors(self, sensors: dict[str, None | str | int | float]) -> None:
         """Add or update all sensor values."""
         for key, value in sensors.items():
@@ -108,7 +110,7 @@ class CCLDevice:
         try:
             for callback in self._update_callbacks:
                 callback()
-        except Exception as err: # pylint: disable=broad-exception-caught
+        except Exception as err:  # pylint: disable=broad-exception-caught
             _LOGGER.warning("Error while publishing sensor updates: %s", err)
 
     def register_new_binary_sensor_cb(self, callback: Callable[[], None]) -> None:
@@ -139,5 +141,5 @@ class CCLDevice:
                     for callback in self._new_sensor_callbacks:
                         callback(sensor)
                 self._new_sensors.remove(sensor)
-            except Exception as err: # pylint: disable=broad-exception-caught
-                _LOGGER.warning("Error while publishing new sensors: %s", err)
+            except Exception as err:  # pylint: disable=broad-exception-caught
+                _LOGGER.warning("Error while publishing new sensors: %s", err)

aioccl/server.py

@@ -3,9 +3,9 @@
 from __future__ import annotations
 
 import logging
+from typing import Callable
 
 from aiohttp import web
-import aiohttp_cors
 
 from .device import CCLDevice, CCL_DEVICE_INFO_TYPES
 from .sensor import CCL_SENSORS
@@ -21,47 +21,38 @@ class CCLServer:
     devices: dict[str, CCLDevice] = {}
 
     @staticmethod
-    def add_copy(device: CCLDevice) -> None:
-        """Attach a device copy to the server."""
+    def register(device: CCLDevice) -> None:
+        """Register a device with a passkey."""
         CCLServer.devices.setdefault(device.passkey, device)
-        _LOGGER.debug(CCLServer.devices)
-
-    # routes = web.RouteTableDef()
+        _LOGGER.debug("Device registered: %s", CCLServer.devices)
 
+    @staticmethod
+    def get_handler() -> Callable[[web.BaseRequest], web.Response]:
+        """Get the handler."""
+        return CCLServer._handler
+    
     @staticmethod
     async def _handler(request: web.BaseRequest) -> web.Response:
         """Handle POST requests for data updating."""
-
-        class HandlerStorage:
-            """Store data for a single request."""
-
-            body: dict[str, None | str | int | float]
-            info: dict[str, None | str]
-            sensors: dict[str, None | str | int | float]
-
-        _LOGGER.debug("Request received.")
-
-        # Resetting variables
+        _body: dict[str, None | str | int | float] = {}
         _device: CCLDevice = None
-
-        HandlerStorage.body = {}
-        HandlerStorage.info = {}
-        HandlerStorage.sensors = {}
-
+        _info: dict[str, None | str] = {}
+        _passkey: str = ''
+        _sensors: dict[str, None | str | int | float] = {}
         _status: None | int = None
         _text: None | str = None
 
         try:
             for passkey, _device in CCLServer.devices.items():
                 if passkey == request.match_info["passkey"]:
+                    _passkey = passkey
                     break
             assert _device, 404
 
             assert request.content_type == "application/json", 400
             assert 0 < request.content_length <= 5000, 400
 
-            HandlerStorage.body = await request.json()
-            _LOGGER.debug(HandlerStorage.body)
+            _body = await request.json()
 
         except Exception as err:  # pylint: disable=broad-exception-caught
             _status = err.args[0]
@@ -75,42 +66,29 @@ class CCLServer:
             _LOGGER.debug("Request exception occured: %s", err)
             return web.Response(status=_status, text=_text)
 
-        else:
-            for key, value in HandlerStorage.body.items():
-                if key in CCL_DEVICE_INFO_TYPES:
-                    HandlerStorage.info.setdefault(key, value)
-                elif key in CCL_SENSORS:
-                    HandlerStorage.sensors.setdefault(key, value)
-
-            _device.update_info(HandlerStorage.info)
-            _device.update_sensors(HandlerStorage.sensors)
-            _status = 200
-            _text = "200 OK"
-            _LOGGER.debug("Request processed.")
-            return web.Response(status=_status, text=_text)
-
-    app = web.Application()
+        
+        for key, value in _body.items():
+            if key in CCL_DEVICE_INFO_TYPES:
+                _info.setdefault(key, value)
+            elif key in CCL_SENSORS:
+                _sensors.setdefault(key, value)
 
-    cors = aiohttp_cors.setup(app)
+        _device.update_info(_info)
+        _device.update_sensors(_sensors)
+        _status = 200
+        _text = "200 OK"
+        _LOGGER.debug("Request processed: %s", _passkey)
+        return web.Response(status=_status, text=_text)
 
-    resource = cors.add(app.router.add_resource("/{passkey}"))
-    route = cors.add(
-        resource.add_route("POST", _handler),
-        {
-            "*": aiohttp_cors.ResourceOptions(
-                allow_credentials=True,
-                expose_headers="*",
-                allow_headers="*",
-            )
-        },
-    )
+    app = web.Application()
+    app.add_routes([web.get('/{passkey}', _handler)])
+    runner = web.AppRunner(app)
 
     @staticmethod
     async def run() -> None:
-        """Try to run the API server in case none is available."""
+        """Try to run the API server."""
         try:
             _LOGGER.debug("Trying to start the API server.")
-            CCLServer.runner = web.AppRunner(CCLServer.app)
             await CCLServer.runner.setup()
             site = web.TCPSite(CCLServer.runner, port=CCLServer.LISTEN_PORT)
             await site.start()

{aioccl-2024.10.dist-info → aioccl-2024.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioccl
-Version: 2024.10
+Version: 2024.12.2
 Summary: A Python library for CCL API server
 Home-page: https://github.com/fkiscd/aioccl
 Download-URL: https://github.com/fkiscd/aioccl
@@ -16,8 +16,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp >3
-Requires-Dist: aiohttp-cors >=0.7.0
+Requires-Dist: aiohttp>3
+Requires-Dist: aiohttp_cors>=0.7.0
 
 # aioCCL
 A Python library for CCL API server

aioccl-2024.12.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+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,,

{aioccl-2024.10.dist-info → aioccl-2024.12.2.dist-info}/WHEEL

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

aioccl-2024.10.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioccl/__init__.py,sha256=XnegKtbvHvUTwVuuWNLb4LB9ZuGGar0xrZYOqk7scyg,133
-aioccl/device.py,sha256=AjTlcIFysxPg57InXE8BEnRethEpypZsu5wf3tW5wuk,5390
-aioccl/sensor.py,sha256=tMv_ypqsDIxWdghHQv91PUTOt2kUJGygZmFnJtzOx0k,16905
-aioccl/server.py,sha256=2uilFTQ44SOoPG925K7lW9WJvGBgllaoR8QznK2LNe4,3916
-aioccl-2024.10.dist-info/LICENSE,sha256=PBRsTHchx7o0TQ2R2ktEAfFmn1iNHTxcOP_xaeuSAuo,11349
-aioccl-2024.10.dist-info/METADATA,sha256=FCuVzmEzJ9_tTnlPF6jGPVFq-JrIm3dZD4V4K8i75_E,768
-aioccl-2024.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-aioccl-2024.10.dist-info/top_level.txt,sha256=-xIJfyfXTaW_EH7XCIHyxjSSSwjLmawa2qhsrHZH1vA,7
-aioccl-2024.10.dist-info/RECORD,,